Avoid NULL deref in an error path. CID 183467

diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index 2c78659bab7a6de48aaab0ddb2970d1ed88453ed..61ebb21731003e948862909b1cf818acccb3b9fb 100644 (file)
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -584,8 +584,10 @@ cvtsudoers_string_alloc(const char *s)
 void
 cvtsudoers_string_free(struct cvtsudoers_string *ls)
 {
-    free(ls->str);
-    free(ls);
+    if (ls != NULL) {
+       free(ls->str);
+       free(ls);
+    }
 }
 
 struct cvtsudoers_str_list *
@@ -595,8 +597,10 @@ str_list_alloc(void)
     debug_decl(str_list_alloc, SUDOERS_DEBUG_UTIL)
 
     strlist = malloc(sizeof(*strlist));
-    STAILQ_INIT(strlist);
-    strlist->refcnt = 1;
+    if (strlist != NULL) {
+       STAILQ_INIT(strlist);
+       strlist->refcnt = 1;
+    }
 
     debug_return_ptr(strlist);
 }
@@ -608,12 +612,14 @@ str_list_free(void *v)
     struct cvtsudoers_string *first;
     debug_decl(str_list_free, SUDOERS_DEBUG_UTIL)
 
-    if (--strlist->refcnt == 0) {
-       while ((first = STAILQ_FIRST(strlist)) != NULL) {
-           STAILQ_REMOVE_HEAD(strlist, entries);
-           cvtsudoers_string_free(first);
+    if (strlist != NULL) {
+       if (--strlist->refcnt == 0) {
+           while ((first = STAILQ_FIRST(strlist)) != NULL) {
+               STAILQ_REMOVE_HEAD(strlist, entries);
+               cvtsudoers_string_free(first);
+           }
+           free(strlist);
        }
-       free(strlist);
     }
     debug_return;
 }