]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
cf_pair_dup(): be 'NOT NULL' to prevent SEGV 1322/head
authorJorge Pereira <jpereiran@gmail.com>
Wed, 14 Oct 2015 04:51:26 +0000 (01:51 -0300)
committerJorge Pereira <jpereiran@gmail.com>
Wed, 14 Oct 2015 04:52:33 +0000 (01:52 -0300)
src/main/conffile.c

index 855c0bb32ab943c8f7a9e47e2626cc21952e250f..4ea95350d86947c18776779decbf395bf1333e8c 100644 (file)
@@ -568,7 +568,7 @@ CONF_PAIR *cf_pair_dup(CONF_SECTION *parent, CONF_PAIR *cp)
        /*
         *      Avoid mallocs if possible.
         */
-       if (!cp->item.filename || (strcmp(parent->item.filename, cp->item.filename) == 0)) {
+       if (!cp->item.filename || (parent->item.filename && !strcmp(parent->item.filename, cp->item.filename))) {
                new->item.filename = parent->item.filename;
        } else {
                new->item.filename = talloc_strdup(new, cp->item.filename);