commit 56abfa5ce678c8022a8777db706ac092e45c88c3
author Aaron Vaage <vaage@google.com> Tue Sep 08 21:33:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 08 21:33:29 2015 +0000
tree b4d54a09640586c620666682ff06b30cd63157b8
parent 830387182ec0bee5d2b4a5b03877380cde9456ed
parent e5b641e6effda54945577e9348df86213b38baeb

Merge "Resolving createByteBufferFromABuffer null input"

media/jni/android_media_MediaCodec.cpp

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 218a117..93a4426 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -440,6 +440,12 @@
     // if this is an ABuffer that doesn't actually hold any accessible memory,
     // use a null ByteBuffer
     *buf = NULL;
+
+    if (buffer == NULL) {
+        ALOGV("createByteBufferFromABuffer - given NULL, returning NULL");
+        return OK;
+    }
+
     if (buffer->base() == NULL) {
         return OK;
     }