From e5b641e6effda54945577e9348df86213b38baeb Mon Sep 17 00:00:00 2001 From: Aaron Vaage Date: Thu, 3 Sep 2015 15:12:57 -0700 Subject: [PATCH] Resolving createByteBufferFromABuffer null input It was found that createByteBufferFromABuffer was recieving a NULL buffer in bug 22726278. Based on returning NULL when buffer->base() == NULL, returning NULL when buffer == NULL. This does not fix bug 22726278 - but address a problem found while looking into it. Bug: 22726278 Change-Id: I933b6a4a535d803576a4cdd7a1ffaf4a428c3201 --- media/jni/android_media_MediaCodec.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 218a11761b5a9..93a44261281bd 100644 --- 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; }