From: Alan T. DeKok Date: Thu, 12 Aug 2021 16:41:21 +0000 (-0400) Subject: after some thought, perhaps a better fix X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ddc3cbca16c151429bb08fe296c6982f0c59b9d;p=thirdparty%2Ffreeradius-server.git after some thought, perhaps a better fix --- diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c index 0205af1b179..ea155d5fff9 100644 --- a/src/lib/util/dict_util.c +++ b/src/lib/util/dict_util.c @@ -2213,6 +2213,8 @@ ssize_t dict_attr_search(fr_dict_attr_err_t *err, fr_dict_attr_t const **out, ssize_t slen = 0; fr_sbuff_t our_in = FR_SBUFF_NO_ADVANCE(in); + if (internal && !dict_gctx->internal) internal = false; + /* * Always going to fail... */ @@ -2221,10 +2223,6 @@ ssize_t dict_attr_search(fr_dict_attr_err_t *err, fr_dict_attr_t const **out, return 0; } -#ifdef __clang_analyzer__ - if (internal && !dict_gctx->internal) return -1; -#endif - /* * dict_def search in the specified dictionary */