From: James Jones Date: Thu, 5 May 2022 21:55:00 +0000 (-0500) Subject: Move use of out after check for NULL (CID #1503900) (#4482) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28ad4a41c63ced952e93e98aaf3db4cbd9d9728b;p=thirdparty%2Ffreeradius-server.git Move use of out after check for NULL (CID #1503900) (#4482) --- diff --git a/src/lib/json/json.c b/src/lib/json/json.c index 784b28da27f..33e3eec72f6 100644 --- a/src/lib/json/json.c +++ b/src/lib/json/json.c @@ -450,10 +450,12 @@ static int json_afrom_value_box(TALLOC_CTX *ctx, json_object **out, */ static inline ssize_t attr_name_with_prefix(fr_sbuff_t *out, fr_dict_attr_t const *da, fr_json_format_t const *format) { - fr_sbuff_t our_out = FR_SBUFF(out); + fr_sbuff_t our_out; if (!out) return 0; + our_out = FR_SBUFF(out); + if (format->attr.prefix) { FR_SBUFF_IN_STRCPY_RETURN(&our_out, format->attr.prefix); FR_SBUFF_IN_CHAR_RETURN(&our_out, ':');