macOS Fix potential memory leaks in the Metal renderer caught by clan…

…g's static analyzer.
libsdl-org · Oct 26, 2019 · a9b867a · a9b867a
1 parent 1ce1364
commit a9b867a
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
@@ -173,6 +173,7 @@ - (void)dealloc
     [_mtltexture release];
     [_mtltexture_uv release];
     [_mtlsampler release];
+    [_lockedbuffer release];
     [super dealloc];
 }
 #endif
@@ -831,6 +832,7 @@ - (void)dealloc
     METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
     METAL_TextureData *texturedata = (__bridge METAL_TextureData *)texture->driverdata;
     int buffersize = 0;
+    id<MTLBuffer> lockedbuffer = nil;
 
     if (rect->w <= 0 || rect->h <= 0) {
         return SDL_SetError("Invalid rectangle dimensions for LockTexture.");
@@ -844,13 +846,19 @@ - (void)dealloc
         buffersize = (*pitch) * rect->h;
     }
 
-    texturedata.lockedrect = *rect;
-    texturedata.lockedbuffer = [data.mtldevice newBufferWithLength:buffersize options:MTLResourceStorageModeShared];
-    if (texturedata.lockedbuffer == nil) {
+    lockedbuffer = [data.mtldevice newBufferWithLength:buffersize options:MTLResourceStorageModeShared];
+    if (lockedbuffer == nil) {
         return SDL_OutOfMemory();
     }
 
-    *pixels = [texturedata.lockedbuffer contents];
+    texturedata.lockedrect = *rect;
+    texturedata.lockedbuffer = lockedbuffer;
+    *pixels = [lockedbuffer contents];
+
+    /* METAL_TextureData.lockedbuffer retains. */
+#if !__has_feature(objc_arc)
+    [lockedbuffer release];
+#endif
 
     return 0;
 }}
@@ -934,11 +942,7 @@ - (void)dealloc
     [data.mtlcmdbuffer commit];
     data.mtlcmdbuffer = nil;
 
-#if !__has_feature(objc_arc)
-    [texturedata.lockedbuffer release];
-#endif
-
-    texturedata.lockedbuffer = nil;
+    texturedata.lockedbuffer = nil; /* Retained property, so it calls release. */
     texturedata.hasdata = YES;
 }}
 
@@ -1299,6 +1303,8 @@ - (void)dealloc
 { @autoreleasepool {
     METAL_RenderData *data = (__bridge METAL_RenderData *) renderer->driverdata;
     METAL_DrawStateCache statecache;
+    SDL_zero(statecache);
+
     id<MTLBuffer> mtlbufvertex = nil;
 
     statecache.pipeline = nil;
@@ -1586,6 +1592,9 @@ - (void)dealloc
     view = SDL_Metal_CreateView(window);
 
     if (view == NULL) {
+#if !__has_feature(objc_arc)
+        [mtldevice release];
+#endif
         SDL_free(renderer);
         return NULL;
     }
@@ -1594,6 +1603,9 @@ - (void)dealloc
     data = [[METAL_RenderData alloc] init];
 
     if (data == nil) {
+#if !__has_feature(objc_arc)
+        [mtldevice release];
+#endif
         SDL_Metal_DestroyView(view);
         SDL_free(renderer);
         return NULL;