commit c22c00c82fa37e2c567c1d4976c133bbd46831a0
author Marco Nelissen <marcone@google.com> Thu Nov 12 10:36:51 2015 -0800
committer Marco Nelissen <marcone@google.com> Thu Nov 12 10:44:17 2015 -0800
tree e16a17f78a4a2ba4010f4abde057e3f7300e08ca
parent 808e3d55dfafd6fc8f53827c668668144a706253

Fix possible media extractor service crash

Change-Id: I7501eee0d375745243a9e9acceacd526b6f322b7

media/libmedia/IMediaExtractorService.cpp

diff --git a/media/libmedia/IMediaExtractorService.cpp b/media/libmedia/IMediaExtractorService.cpp
index 51a3c1a..dcbbde2 100644
--- a/media/libmedia/IMediaExtractorService.cpp
+++ b/media/libmedia/IMediaExtractorService.cpp
@@ -65,7 +65,13 @@
 
         case MAKE_EXTRACTOR: {
             CHECK_INTERFACE(IMediaExtractorService, data, reply);
-            sp<IDataSource> source = interface_cast<IDataSource>(data.readStrongBinder());
+            sp<IBinder> b;
+            status_t ret = data.readStrongBinder(&b);
+            if (ret != NO_ERROR || b == NULL) {
+                ALOGE("Error reading source from parcel");
+                return ret;
+            }
+            sp<IDataSource> source = interface_cast<IDataSource>(b);
             const char *mime = data.readCString();
             sp<IMediaExtractor> ex = makeExtractor(source, mime);
             reply->writeStrongBinder(IInterface::asBinder(ex));