Changeset 30404 in vbox for trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

Timestamp:

Jun 23, 2010 8:27:59 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63025

Message:

NAT: fixed RTMemFree condition

File:

• trunk/src/VBox/Devices/Network/slirp/ip_icmp.c (modified) (3 diffs)

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -330 +330 @@
 {
     register struct icmp *icp;
-    int fIcpOnMbuf = 1; /* if icp pointer to m->m_data */
+    void *icp_buf = NULL;
     register struct ip *ip = mtod(m, struct ip *);
     int icmplen = ip->ip_len;
@@ -367 +367 @@
     }
 
-    if (m->m_next != NULL)
-    {
-        char *buf = RTMemAlloc(icmplen);
-        if (!buf)
+    if (m->m_next)
+    {
+        icp_buf = RTMemAlloc(icmplen);
+        if (!icp_buf)
         {
             LogRel(("NAT: not enought memory to allocate the buffer\n"));
             goto end_error;
         }
-        m_copydata(m, 0, icmplen, buf);
-        icp = (struct icmp *)buf;
-        fIcpOnMbuf = 0;
+        m_copydata(m, 0, icmplen, icp_buf);
+        icp = (struct icmp *)icp_buf;
     }
     else
         icp = mtod(m, struct icmp *);
-
 
     m->m_len += hlen;
@@ -509 +507 @@
 end_error:
     m_freem(pData, m);
+
 done:
-    if (   !fIcpOnMbuf
-        && !icp)
-        RTMemFree(icp);
+    if (icp_buf)
+        RTMemFree(icp_buf);
 }