Changeset 53366 in vbox for trunk

Timestamp:

Nov 21, 2014 2:09:36 AM (10 years ago)

Author:

vboxsync

Message:

NAT/Net: Fix size calculations when allocating a pong, don't
over-allocate struct padding.

File:

• trunk/src/VBox/NetworkServices/NAT/pxping_win.c (modified) (2 diffs)

trunk/src/VBox/NetworkServices/NAT/pxping_win.c

@@ -193 +193 @@
 
     bufsize = sizeof(ICMP_ECHO_REPLY) + p->tot_len;
-    pong = (struct pong4 *)malloc(sizeof(*pong) - sizeof(pong->buf) + bufsize);
+    pong = (struct pong4 *)malloc(RT_OFFSETOF(struct pong4, buf) + bufsize);
     if (RT_UNLIKELY(pong == NULL)) {
         goto out;
@@ -470 +470 @@
 
     bufsize = sizeof(ICMPV6_ECHO_REPLY) + p->tot_len;
-    pong = (struct pong6 *)malloc(sizeof(*pong) - sizeof(pong->buf) + bufsize);
+    pong = (struct pong6 *)malloc(RT_OFFSETOF(struct pong6, buf) + bufsize);
     if (RT_UNLIKELY(pong == NULL)) {
         goto out;