From: Jorge Pereira <jpereiran@gmail.com>
Date: Wed, 14 Oct 2015 04:51:26 +0000 (-0300)
Subject: cf_pair_dup(): be 'NOT NULL' to prevent SEGV
X-Git-Tag: release_3_0_11~256^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1322%2Fhead;p=thirdparty%2Ffreeradius-server.git

cf_pair_dup(): be 'NOT NULL' to prevent SEGV
---

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);