From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 6 Mar 2013 16:42:15 +0000 (-0500)
Subject: Don't segv if we log an error with a NULL cs
X-Git-Tag: release_3_0_0_beta1~821
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f6ea6c3eea240353eefccae49fee6e6efee4a5;p=thirdparty%2Ffreeradius-server.git

Don't segv if we log an error with a NULL cs
---

diff --git a/src/main/conffile.c b/src/main/conffile.c
index faae0535162..c20a3a3db96 100644
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -2600,10 +2600,14 @@ void cf_log_err(const CONF_ITEM *ci, const char *fmt, ...)
 	vsnprintf(buffer, sizeof(buffer), fmt, ap);
 	va_end(ap);
 
-	radlog(L_ERR, "%s[%d]: %s",
-	       ci ? ci->filename : "unknown",
-	       ci ? ci->lineno : 0,
-	       buffer);
+	if (ci) {
+		radlog(L_ERR, "%s[%d]: %s",
+		       ci ? ci->filename : "unknown",
+		       ci ? ci->lineno : 0,
+		       buffer);
+	} else {
+		radlog(L_ERR, "<unknown>[*]: %s", buffer);
+	}
 }