From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 28 May 2015 15:28:39 +0000 (-0400)
Subject: cp filename may be NULL
X-Git-Tag: release_3_0_9~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=893ee8add2d476a8da63a40acc546a6236c0df07;p=thirdparty%2Ffreeradius-server.git

cp filename may be NULL
---

diff --git a/src/main/conffile.c b/src/main/conffile.c
index ebc364f27de..0f18c033624 100644
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -362,7 +362,7 @@ CONF_PAIR *cf_pair_dup(CONF_SECTION *parent, CONF_PAIR *cp)
 	/*
 	 *	Avoid mallocs if possible.
 	 */
-	if (strcmp(parent->item.filename, cp->item.filename) == 0) {
+	if (!cp->item.filename || (strcmp(parent->item.filename, cp->item.filename) == 0)) {
 		new->item.filename = parent->item.filename;
 	} else {
 		new->item.filename = talloc_strdup(new, cp->item.filename);
@@ -475,7 +475,7 @@ CONF_SECTION *cf_section_dup(CONF_SECTION *parent, CONF_SECTION const *cs,
 
 	new->item.lineno = cs->item.lineno;
 
-	if (strcmp(parent->item.filename, cs->item.filename) == 0) {
+	if (!cs->item.filename || (strcmp(parent->item.filename, cs->item.filename) == 0)) {
 		new->item.filename = parent->item.filename;
 	} else {
 		new->item.filename = talloc_strdup(new, cs->item.filename);