commit fcf5720ddba1bb9468fc9e3af6ef31a34ed4bfa5
author mspector@google.com <mspector@google.com> Mon Feb 22 01:58:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 22 01:58:39 2016 +0000
tree 6bfd31e1ed1f202ec3daf8a8cc2bbf72b84b1d13
parent 46c1af60749a9d0ff9551998f2648cb7cc2b1124
parent aef546b8f79e9a9252005b60122899cf5f8af67c

IOMX.cpp uninitialized pointer in BnOMX::onTransact am: 9d72eb0682 am: bbcb1f0e2f am: 6dcf6ba111 am: 35501e45b2 am: 88b6660083 am: 22d12769b3 am: 7d4d66e605 am: 3c6a1fe754
am: aef546b8f7

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

media/libmedia/IOMX.cpp

diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp
index d1832b6..bd398aa 100644
--- a/media/libmedia/IOMX.cpp
+++ b/media/libmedia/IOMX.cpp
@@ -447,7 +447,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;
@@ -990,7 +990,9 @@
             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;
         }