Changeset 52598 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Sep 4, 2014 5:24:21 PM (10 years ago)

Author:

vboxsync

Message:

3D: darwin host: fix a few memory leaks, objects initialization issues and reference counting.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -369 +369 @@
 - (id)initWithObject:(id)aObject selector:(SEL)aSelector arg:(id)aArg
 {
-    [aObject retain];
-    m_Object = aObject;
-    m_Selector = aSelector;
-    if (aArg != nil)
-        [aArg retain];
-    m_Arg = aArg;
-    
+    self = [super init];
+
+    if (self)
+    {
+        [aObject retain];
+        m_Object = aObject;
+        m_Selector = aSelector;
+        if (aArg != nil)
+            [aArg retain];
+        m_Arg = aArg;
+    }
+
     return self;
 }
@@ -389 +394 @@
     if (m_Arg != nil)
         [m_Arg release];
+
+    [super dealloc];
 }
 @end
@@ -395 +402 @@
 - (id)init
 {
-    int rc = RTCritSectInit(&m_Lock);
-    if (!RT_SUCCESS(rc))
-    {
-        DEBUG_WARN(("RTCritSectInit failed %d\n", rc));
-        return nil;
-    }
-
-    m_CurIndex = 0;
-    
-    m_pArray = [[NSMutableArray alloc] init];
+    self = [super init];
+
+    if (self)
+    {
+        int rc = RTCritSectInit(&m_Lock);
+        if (!RT_SUCCESS(rc))
+        {
+            DEBUG_WARN(("RTCritSectInit failed %d\n", rc));
+            return nil;
+        }
+
+        m_CurIndex = 0;
+
+        m_pArray = [[NSMutableArray alloc] init];
+    }
+
     return self;
 }
@@ -410 +423 @@
 - (void)add:(VBoxTask*)pTask
 {
-    [pTask retain];
     int rc = RTCritSectEnter(&m_Lock);
     if (RT_SUCCESS(rc))
@@ -477 +489 @@
     [m_pArray release];
     RTCritSectDelete(&m_Lock);
+
+    [super dealloc];
 }
 @end
@@ -548 +562 @@
     VBoxTaskPerformSelector *pSelTask = [[VBoxTaskPerformSelector alloc] initWithObject:aObject selector:aSelector arg:aArg];
     [self add:pSelTask];
-    [pSelTask release];
 }
 
@@ -590 +603 @@
 {
     [m_pTasks release];
+    [super dealloc];
 }