@@ -532,72 +532,72 @@ static int cfl_to_json(struct cfl_variant *var, flb_sds_t buf)
532
532
533
533
switch (var -> type ) {
534
534
case CFL_VARIANT_NULL :
535
- flb_sds_cat ( buf , "null" , 4 );
535
+ flb_sds_cat_safe ( & buf , "null" , 4 );
536
536
break ;
537
537
case CFL_VARIANT_BOOL :
538
538
if (var -> data .as_bool ) {
539
- flb_sds_cat ( buf , "true" , 4 );
539
+ flb_sds_cat_safe ( & buf , "true" , 4 );
540
540
}
541
541
else {
542
- flb_sds_cat ( buf , "false" , 5 );
542
+ flb_sds_cat_safe ( & buf , "false" , 5 );
543
543
}
544
544
break ;
545
545
case CFL_VARIANT_INT : {
546
546
char tmp [32 ] = {0 };
547
547
i = snprintf (tmp , sizeof (tmp )- 1 , "%" PRId64 , var -> data .as_int64 );
548
- flb_sds_cat ( buf , tmp , i );
548
+ flb_sds_cat_safe ( & buf , tmp , i );
549
549
break ;
550
550
}
551
551
case CFL_VARIANT_UINT : {
552
552
char tmp [32 ] = {0 };
553
553
i = snprintf (tmp , sizeof (tmp )- 1 , "%" PRIu64 , var -> data .as_uint64 );
554
- flb_sds_cat ( buf , tmp , i );
554
+ flb_sds_cat_safe ( & buf , tmp , i );
555
555
break ;
556
556
}
557
557
case CFL_VARIANT_DOUBLE : {
558
558
char tmp [512 ] = {0 };
559
559
i = snprintf (tmp , sizeof (tmp )- 1 , "%" PRIu64 , var -> data .as_uint64 );
560
- flb_sds_cat ( buf , tmp , i );
560
+ flb_sds_cat_safe ( & buf , tmp , i );
561
561
break ;
562
562
}
563
563
case CFL_VARIANT_STRING :
564
- flb_sds_cat ( buf , "\"" , 1 );
565
- flb_sds_cat ( buf , var -> data .as_string , cfl_sds_len (var -> data .as_string ));
566
- flb_sds_cat ( buf , "\"" , 1 );
564
+ flb_sds_cat_safe ( & buf , "\"" , 1 );
565
+ flb_sds_cat_safe ( & buf , var -> data .as_string , cfl_sds_len (var -> data .as_string ));
566
+ flb_sds_cat_safe ( & buf , "\"" , 1 );
567
567
break ;
568
568
case CFL_VARIANT_BYTES :
569
- flb_sds_cat ( buf , "\"" , 1 );
570
- flb_sds_cat ( buf , var -> data .as_string , cfl_sds_len (var -> data .as_bytes ));
571
- flb_sds_cat ( buf , "\"" , 1 );
569
+ flb_sds_cat_safe ( & buf , "\"" , 1 );
570
+ flb_sds_cat_safe ( & buf , var -> data .as_string , cfl_sds_len (var -> data .as_bytes ));
571
+ flb_sds_cat_safe ( & buf , "\"" , 1 );
572
572
break ;
573
573
case CFL_VARIANT_ARRAY : {
574
574
struct cfl_array * array = var -> data .as_array ;
575
575
loop = cfl_array_size (array );
576
576
577
- flb_sds_cat ( buf , "[" , 1 );
577
+ flb_sds_cat_safe ( & buf , "[" , 1 );
578
578
if (loop != 0 ) {
579
579
for (i = 0 ; i < loop - 1 ; i ++ ) {
580
580
cfl_to_json (array -> entries [i ], buf );
581
- flb_sds_cat ( buf , "," , 1 );
581
+ flb_sds_cat_safe ( & buf , "," , 1 );
582
582
}
583
583
}
584
584
cfl_to_json (array -> entries [loop - 1 ], buf );
585
- flb_sds_cat ( buf , "]" , 1 );
585
+ flb_sds_cat_safe ( & buf , "]" , 1 );
586
586
break ;
587
587
}
588
588
case CFL_VARIANT_KVLIST :
589
589
kvlist = var -> data .as_kvlist ;
590
- flb_sds_cat ( buf , "{" , 1 );
590
+ flb_sds_cat_safe ( & buf , "{" , 1 );
591
591
cfl_list_foreach (head , & kvlist -> list ) {
592
592
kv = cfl_list_entry (head , struct cfl_kvpair , _head );
593
593
594
594
/* key */
595
- flb_sds_cat ( buf , "\"" , 1 );
596
- flb_sds_cat ( buf , kv -> key , cfl_sds_len (kv -> key ));
597
- flb_sds_cat ( buf , "\"" , 1 );
595
+ flb_sds_cat_safe ( & buf , "\"" , 1 );
596
+ flb_sds_cat_safe ( & buf , kv -> key , cfl_sds_len (kv -> key ));
597
+ flb_sds_cat_safe ( & buf , "\"" , 1 );
598
598
599
599
/* separator */
600
- flb_sds_cat ( buf , ":" , 1 );
600
+ flb_sds_cat_safe ( & buf , ":" , 1 );
601
601
602
602
/* value */
603
603
ret = cfl_to_json (kv -> val , buf );
@@ -606,7 +606,7 @@ static int cfl_to_json(struct cfl_variant *var, flb_sds_t buf)
606
606
}
607
607
break ;
608
608
}
609
- flb_sds_cat ( buf , "}" , 1 );
609
+ flb_sds_cat_safe ( & buf , "}" , 1 );
610
610
}
611
611
612
612
return 0 ;
0 commit comments