From: Arran Cudbard-Bell Date: Mon, 17 Apr 2023 05:49:52 +0000 (+1000) Subject: skip null values in concat functions X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ace88ec9779d1e96a12a59c943f2c0f74a223f82;p=thirdparty%2Ffreeradius-server.git skip null values in concat functions --- diff --git a/src/lib/util/value.c b/src/lib/util/value.c index 56dc11828fa..048e9362dca 100644 --- a/src/lib/util/value.c +++ b/src/lib/util/value.c @@ -5360,6 +5360,9 @@ ssize_t fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, fr_ slen = fr_sbuff_in_bstrncpy(&our_sbuff, vb->vb_strvalue, vb->vb_length); break; + case FR_TYPE_NULL: /* Skip null */ + continue; + default: print: slen = fr_value_box_print(&our_sbuff, vb, e_rules); @@ -5439,6 +5442,9 @@ ssize_t fr_value_box_list_concat_as_octets(bool *tainted, fr_dbuff_t *dbuff, fr_ slen = fr_dbuff_in_memcpy(&our_dbuff, (uint8_t const *)vb->vb_strvalue, vb->vb_length); break; + case FR_TYPE_NULL: /* Skip null */ + continue; + default: cast: {