Changeset 28510 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 20, 2010 10:25:22 AM (15 years ago)

Author:

vboxsync

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

60309

Message:

refined r60215

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• sbuf.c (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)

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

@@ -43 +43 @@
 {
     /*
-     * vvl: This assert to catch double frees. tcp_close filter out 
-     * listening sockets which pass NULLs here.   
+     * Catch double frees. Actually tcp_close() already filters out listening sockets
+     * passing NULL.
      */
     Assert((sb->sb_data));
-    RTMemFree(sb->sb_data);
-    /** @todo bird: I'm seeing double frees here sometimes.  This NULL'ing is just a
-       workaround for that, it doesn't actually fix anything.  */
-    sb->sb_data = NULL;
+
+    /*
+     * Don't call RTMemFree() for an already freed buffer, the EFence could complain
+     */
+    if (sb->sb_data)
+    {
+        RTMemFree(sb->sb_data);
+        sb->sb_data = NULL;
+    }
 }
 

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

@@ -312 +312 @@
         tcp_last_so = &tcb;
     closesocket(so->s);
-    /* (vvl) opening listening socket we do not reserve sbufs for it */
-    if ((so->so_state & SS_FACCEPTCONN) == 0)
+    /* Avoid double free if the socket is listening and therefore doesn't have
+     * any sbufs reserved. */
+    if (!(so->so_state & SS_FACCEPTCONN))
     {
         sbfree(&so->so_rcv);