commit 2afac0c7c42560ff5b8f133c6074b7e023279d6d
author Wei Jia <wjia@google.com> Thu Jan 07 12:13:07 2016 -0800
committer Wei Jia <wjia@google.com> Thu Jan 07 15:20:31 2016 -0800
tree f541f9d2de183b5b24c857bdf5995845b22efb2b
parent df9e6aaf716279baf0e27b99acf10005924245ed

libmedia: check NULL pointer at binder receiver side.

Change-Id: I464da96f3d6081dd8c3cc2fd977e2b96f5d477bb

media/libmedia/IStreamSource.cpp

diff --git a/media/libmedia/IStreamSource.cpp b/media/libmedia/IStreamSource.cpp
index 840e453..8c0905c 100644
--- a/media/libmedia/IStreamSource.cpp
+++ b/media/libmedia/IStreamSource.cpp
@@ -111,7 +111,11 @@
                 sp<IMemory> mem =
                     interface_cast<IMemory>(data.readStrongBinder());
 
-                buffers.push(mem);
+                if (mem != NULL) {
+                    buffers.push(mem);
+                } else if (data.dataAvail() == 0) {
+                    break;
+                }
             }
             setBuffers(buffers);
             break;