From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 16 Jan 2018 21:10:07 +0000 (-0500)
Subject: work around crash
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16563c71c7d07af4f24363bbf8dcaaab478b267e;p=thirdparty%2Ffreeradius-server.git

work around crash

fr_strerror_printf_push(..., fr_strerror_pop()) now crashes
in the address sanitizer.  It's not clear what's going on in
strerror.c, so it's easier to just avoid the issue.

The errors are still printed, just a bit less clearly.
---

diff --git a/src/lib/util/dict.c b/src/lib/util/dict.c
index 76ff79adc21..8173fe24cd7 100644
--- a/src/lib/util/dict.c
+++ b/src/lib/util/dict.c
@@ -2376,11 +2376,10 @@ static int _dict_from_file(dict_from_file_ctx_t *ctx,
 		if (argc == 0) continue;
 
 		if (argc == 1) {
-			fr_strerror_printf_push("Invalid entry");
+			fr_strerror_printf("Invalid entry");
 
 		error:
-			fr_strerror_printf_push("Error in %s[%d] - %s",
-						fn, line, fr_strerror_pop());
+			fr_strerror_printf_push("Error reading %s[%d]", fn, line);
 			fclose(fp);
 			return -1;
 		}