Merge pull request #663 from adfnekc/master

fix udp payload data messy probelem;fix payloads_datagram_add bug;
robertdavidgraham · Nov 1, 2023 · 7397d80 · 7397d80
2 parents 5ad190d + aabbb26
commit 7397d80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/templ-payloads.c b/src/templ-payloads.c
@@ -538,6 +538,7 @@ payloads_datagram_add(struct PayloadsUDP *payloads,
             payloads->list[j] = p;
 
             payloads->count += count;
+            count = 1;
         }
     }
     return count; /* zero or one */

diff --git a/src/templ-pkt.c b/src/templ-pkt.c
@@ -357,9 +357,9 @@ struct TemplateSet templ_copy(const struct TemplateSet *templset)
     for (i=0; i<templset->count; i++) {
         const struct TemplatePacket *p1 = &templset->pkts[i];
         struct TemplatePacket *p2 = &result.pkts[i];
-        p2->ipv4.packet = MALLOC(p2->ipv4.length);
+        p2->ipv4.packet = MALLOC(2048+p2->ipv4.length);
         memcpy(p2->ipv4.packet, p1->ipv4.packet, p2->ipv4.length);
-        p2->ipv6.packet = MALLOC(p2->ipv6.length);
+        p2->ipv6.packet = MALLOC(2048+p2->ipv6.length);
         memcpy(p2->ipv6.packet, p1->ipv6.packet, p2->ipv6.length);
     }