Changeset 46059 in vbox for trunk/src/VBox/Additions/common

Timestamp:

May 14, 2013 11:18:50 AM (12 years ago)

Author:

vboxsync

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

85732

Message:

crOpenGL fix some leaking on connection cleanup

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu.h (modified) (1 diff)
• packspu_context.c (modified) (1 diff)
• packspu_misc.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h

@@ -83 +83 @@
 extern CRtsd _PackTSD;
 #define GET_THREAD_VAL()  (crGetTSD(&_PackTSD))
-#define GET_THREAD_VAL_ID(_id) (&(pack_spu.thread[(_id) - THREAD_OFFSET_MAGIC]))
+#define GET_THREAD_IDX(_id) ((_id) - THREAD_OFFSET_MAGIC)
+#define GET_THREAD_VAL_ID(_id) (&(pack_spu.thread[GET_THREAD_IDX(_id)]))
 #else
 #define GET_THREAD_VAL()  (&(pack_spu.thread[0]))

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c

@@ -151 +151 @@
     crPackDeleteContext(thread->packer);
 
+    if (thread->buffer.pack)
+    {
+        crNetFree(thread->netServer.conn, thread->buffer.pack);
+        thread->buffer.pack = NULL;
+    }
+
     crNetFreeConnection(thread->netServer.conn);
+
+    if (thread->netServer.name)
+        crFree(thread->netServer.name);
 
     pack_spu.numThreads--;

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -616 +616 @@
                         CR_UNLOCK_PACKER_CONTEXT(thread->packer);
                         crPackDeleteContext(pack_spu.thread[i].packer);
+
+                        if (pack_spu.thread[i].buffer.pack)
+                        {
+                            crNetFree(pack_spu.thread[i].netServer.conn, pack_spu.thread[i].buffer.pack);
+                            pack_spu.thread[i].buffer.pack = NULL;
+                        }
                     }
                     crNetFreeConnection(pack_spu.thread[i].netServer.conn);
+
+                    if (pack_spu.thread[i].netServer.name)
+                        crFree(pack_spu.thread[i].netServer.name);
 
                     pack_spu.numThreads--;