commit 35501e45b25020f4f79187125acec881a581520c
author mspector@google.com <mspector@google.com> Mon Feb 22 01:38:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 22 01:38:09 2016 +0000
tree 642af1d90f16d5725759cd641f6a5c74997c7650
parent b8cd2a261a7922bdf0e43cbd2f42d056fd629843
parent 6dcf6ba1111f43161a634cfa767a196f96ba9b7d

IOMX.cpp uninitialized pointer in BnOMX::onTransact am: 9d72eb0682 am: bbcb1f0e2f
am: 6dcf6ba111

* commit '6dcf6ba1111f43161a634cfa767a196f96ba9b7d':
  IOMX.cpp uninitialized pointer in BnOMX::onTransact

media/libmedia/IOMX.cpp

diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp
index 0ff47de..5214a9d 100644
--- a/media/libmedia/IOMX.cpp
+++ b/media/libmedia/IOMX.cpp
@@ -381,7 +381,7 @@
         remote()->transact(CONFIGURE_VIDEO_TUNNEL_MODE, data, &reply);
 
         status_t err = reply.readInt32();
-        if (sidebandHandle) {
+        if (err == OK && sidebandHandle) {
             *sidebandHandle = (native_handle_t *)reply.readNativeHandle();
         }
         return err;
@@ -833,11 +833,13 @@
             OMX_BOOL tunneled = (OMX_BOOL)data.readInt32();
             OMX_U32 audio_hw_sync = data.readInt32();
 
-            native_handle_t *sideband_handle;
+            native_handle_t *sideband_handle = NULL;
             status_t err = configureVideoTunnelMode(
                     node, port_index, tunneled, audio_hw_sync, &sideband_handle);
             reply->writeInt32(err);
-            reply->writeNativeHandle(sideband_handle);
+            if(err == OK){
+                reply->writeNativeHandle(sideband_handle);
+            }
 
             return NO_ERROR;
         }