]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
work around crash
authorAlan T. DeKok <aland@freeradius.org>
Tue, 16 Jan 2018 21:10:07 +0000 (16:10 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 16 Jan 2018 21:10:07 +0000 (16:10 -0500)
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.

src/lib/util/dict.c

index 76ff79adc21170c41ca2d2ec504b7e9218f04a38..8173fe24cd700f046e101d5c12827a46436ff49f 100644 (file)
@@ -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;
                }