- Timestamp:
- 02/05/19 13:48:07 (2 years ago)
- Branches:
- develop
- Children:
- 7b4f5e2
- Parents:
- e0f2dca
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/format_pktmeta.c
re0f2dca ra0e5b65 165 165 } 166 166 /* Ensure the supplied memory allocation is enough, if not only fill 167 * what we can */167 * what we can. */ 168 168 if (spacelen > r->items[index].len) { 169 169 memcpy(space, r->items[index].data, r->items[index].len); 170 space[r->items[index].len] = '\0'; 170 171 } else { 171 172 memcpy(space, r->items[index].data, spacelen); 173 space[spacelen] = '\0'; 172 174 } 173 175 trace_destroy_meta(r); … … 219 221 if (r->items[index].len > spacelen) { 220 222 memcpy(space, r->items[index].data, spacelen); 223 space[spacelen] = '\0'; 221 224 } else { 222 225 memcpy(space, r->items[index].data, r->items[index].len); 226 space[r->items[index].len] = '\0'; 223 227 } 224 228 trace_destroy_meta(r); … … 332 336 char *addrstr = inet_ntoa(*(struct in_addr *)&addr); 333 337 memcpy(space, addrstr, spacelen); 338 space[spacelen] = '\0'; 334 339 return space; 335 340 } … … 461 466 if (r->items[index].len > spacelen) { 462 467 memcpy(space, r->items[index].data, spacelen); 468 space[spacelen] = '\0'; 463 469 } else { 464 470 memcpy(space, r->items[index].data, r->items[index].len); 471 space[r->items[index].len] = '\0'; 465 472 } 466 473 trace_destroy_meta(r); … … 503 510 if (r->items[0].len > spacelen) { 504 511 memcpy(space, r->items[0].data, spacelen); 512 space[spacelen] = '\0'; 505 513 } else { 506 514 memcpy(space, r->items[0].data, r->items[0].len); 515 space[r->items[0].len] = '\0'; 507 516 } 508 517 trace_destroy_meta(r); … … 596 605 if (r->items[index].len > spacelen) { 597 606 memcpy(space, r->items[index].data, spacelen); 607 space[spacelen] = '\0'; 598 608 } else { 599 609 memcpy(space, r->items[index].data, r->items[index].len); 610 space[r->items[index].len] = '\0'; 600 611 } 601 612 trace_destroy_meta(r); … … 637 648 if (r->items[0].len > spacelen) { 638 649 memcpy(space, r->items[0].data, spacelen); 650 space[spacelen] = '\0'; 639 651 } else { 640 652 memcpy(space, r->items[0].data, r->items[0].len); 653 space[r->items[0].len] = '\0'; 641 654 } 642 655 trace_destroy_meta(r); … … 692 705 if (r->items[0].len > spacelen) { 693 706 memcpy(space, r->items[0].data, spacelen); 707 space[spacelen] = '\0'; 694 708 } else { 695 709 memcpy(space, r->items[0].data, r->items[0].len); 710 space[r->items[0].len] = '\0'; 696 711 } 697 712 trace_destroy_meta(r); … … 713 728 if (r->items[0].len > spacelen) { 714 729 memcpy(space, r->items[0].data, spacelen); 730 space[spacelen] = '\0'; 715 731 } else { 716 732 memcpy(space, r->items[0].data, r->items[0].len); 733 space[r->items[0].len] = '\0'; 717 734 } 718 735 trace_destroy_meta(r); … … 734 751 if (r->items[0].len > spacelen) { 735 752 memcpy(space, r->items[0].data, spacelen); 753 space[spacelen] = '\0'; 736 754 } else { 737 755 memcpy(space, r->items[0].data, r->items[0].len); 738 } 739 trace_destroy_meta(r); 740 return space; 741 } 742 756 space[r->items[0].len] = '\0'; 757 } 758 trace_destroy_meta(r); 759 return space; 760 } 761
Note: See TracChangeset
for help on using the changeset viewer.