commit fb4e9bc9a2a4490436270a4a6b1056e927250340
author Aaron Golden <aegolden@google.com> Fri Jan 04 12:03:31 2019 -0800
committer Commit Bot <commit-bot@chromium.org> Fri Jan 04 21:08:05 2019 +0000
tree f729a5f94f1109a1f1de69ebb5a7af3411145fe1
parent 47e38b73bb07e5b76903c767cb4cba0b810a60bc

Add a missing NULL check before releasing a texture ref.

This causes a crash if the NV12 texture cache attempts to upload textures
for a frame with a NULL backing CVPixelBufferRef.

Bug: webrtc:10175
Change-Id: I6866dcde5ace745cbd95b762254294aa8406c2a5
Reviewed-on: https://webrtc-review.googlesource.com/c/115430
Commit-Queue: Chuck Hays <haysc@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26140}

sdk/objc/components/renderer/opengl/RTCNV12TextureCache.m

diff --git a/sdk/objc/components/renderer/opengl/RTCNV12TextureCache.m b/sdk/objc/components/renderer/opengl/RTCNV12TextureCache.m
index 19213e5..aab62d4 100644
--- a/sdk/objc/components/renderer/opengl/RTCNV12TextureCache.m
+++ b/sdk/objc/components/renderer/opengl/RTCNV12TextureCache.m
@@ -60,8 +60,10 @@
       kCFAllocatorDefault, _textureCache, pixelBuffer, NULL, GL_TEXTURE_2D, pixelFormat, width,
       height, pixelFormat, GL_UNSIGNED_BYTE, planeIndex, textureOut);
   if (ret != kCVReturnSuccess) {
-    CFRelease(*textureOut);
-    *textureOut = nil;
+    if (*textureOut) {
+      CFRelease(*textureOut);
+      *textureOut = nil;
+    }
     return NO;
   }
   NSAssert(CVOpenGLESTextureGetTarget(*textureOut) == GL_TEXTURE_2D,