]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
skip null values in concat functions
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 17 Apr 2023 05:49:52 +0000 (15:49 +1000)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 17 Apr 2023 05:49:52 +0000 (15:49 +1000)
src/lib/util/value.c

index 56dc11828fa6ba0a3d886cfc726a6dd27d4aba78..048e9362dca8cdd32cb97bbc10541551e07e3e6c 100644 (file)
@@ -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:
                        {