Merge "Resolving createByteBufferFromABuffer null input"

2015-09-08 21:33:29 +00:00
parent 830387182e e5b641e6ef
commit 56abfa5ce6
1 changed files with 6 additions and 0 deletions
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -440,6 +440,12 @@ status_t JMediaCodec::createByteBufferFromABuffer(
    // 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;
    }