From 98102f50149b7487fececcc01ab5cdb5b48d2a45 Mon Sep 17 00:00:00 2001 From: Jorge Pereira Date: Wed, 14 Oct 2015 01:51:26 -0300 Subject: [PATCH] cf_pair_dup(): be 'NOT NULL' to prevent SEGV --- src/main/conffile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/conffile.c b/src/main/conffile.c index 855c0bb32a..4ea95350d8 100644 --- a/src/main/conffile.c +++ b/src/main/conffile.c @@ -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); -- 2.47.2