Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / plist.c

diff --git a/src/plist.c b/src/plist.c
index 25f6676ca9a2c110f6bb5a0800f2f59c81901d69..38cde5b435c3d1b7e6d16ff844ca4b180c735482 100644 (file)
--- a/src/plist.c
+++ b/src/plist.c
@@ -69,15 +69,19 @@ struct psi_plist *psi_plist_init_ex(size_t size, void (*dtor)(void *)) {
 void psi_plist_clean(struct psi_plist *list) {
        size_t i;
 
-       if (list->dtor) for (i = 0; i < list->count; ++i) {
-               list->dtor(PLIST_ELE(list, i));
+       if (list) {
+               if (list->dtor) for (i = 0; i < list->count; ++i) {
+                       list->dtor(PLIST_ELE(list, i));
+               }
+               list->count = 0;
        }
-       list->count = 0;
 }
 
 void psi_plist_free(struct psi_plist *list) {
-       psi_plist_clean(list);
-       free(list);
+       if (list) {
+               psi_plist_clean(list);
+               free(list);
+       }
 }
 
 struct psi_plist *psi_plist_copy(struct psi_plist *list, void (*ctor)(void *))
@@ -117,7 +121,7 @@ struct psi_plist *psi_plist_add(struct psi_plist *list, void *ptr) {
 }
 
 struct psi_plist *psi_plist_add_r(struct psi_plist *list, size_t num_eles, void **eles) {
-       if (list && list->count) {
+       if (list) {
                list = realloc(list, sizeof(*list) + list->size + (num_eles + list->count) * list->size);
        }
        if (list) {