Changeset 53367 in vbox

Timestamp:

Nov 21, 2014 4:09:35 AM (10 years ago)

Author:

vboxsync

Message:

NAT/Net: pxping_recv4 - ensure that for small ping payloads we still
allocate enough for ICMP API to hold its internal data. Always add a
bit of extra space that is needed at least on Windows XP, empirically

File:

• trunk/src/VBox/NetworkServices/NAT/pxping_win.c (modified) (1 diff)

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

@@ -192 +192 @@
     }
 
-    bufsize = sizeof(ICMP_ECHO_REPLY) + p->tot_len;
+    bufsize = sizeof(ICMP_ECHO_REPLY);
+    if (p->tot_len < sizeof(IO_STATUS_BLOCK) + sizeof(struct icmp_echo_hdr))
+        bufsize += sizeof(IO_STATUS_BLOCK) + sizeof(struct icmp_echo_hdr);
+    else
+        bufsize += p->tot_len;
+    bufsize += 16; /* whatever that is; empirically at least XP needs it */
+
     pong = (struct pong4 *)malloc(RT_OFFSETOF(struct pong4, buf) + bufsize);
     if (RT_UNLIKELY(pong == NULL)) {