commit 027b81154c4296f3d0caa861d43b19a5f57797cd
author Wei Jia <wjia@google.com> Mon Apr 04 09:50:14 2016 -0700
committer Wei Jia <wjia@google.com> Mon Apr 04 10:48:36 2016 -0700
tree a8db340b9ee5606ae4b429488bc4ef2154b6e0cc
parent ca0cde2597b527083a2f86bda4db00dccaf394d6

IMediaSource: release MediaBuffers when desired shared memory is not available.

Bug: 27970343
Change-Id: Ia86ecbffb3c3ebc2e8e0e10b951fa7b001bbdb5f

media/libmedia/IMediaSource.cpp

diff --git a/media/libmedia/IMediaSource.cpp b/media/libmedia/IMediaSource.cpp
index 8376c0a..84f1181 100644
--- a/media/libmedia/IMediaSource.cpp
+++ b/media/libmedia/IMediaSource.cpp
@@ -295,13 +295,19 @@
                             mGroup->add_buffer(new MediaBuffer(allocateSize));
                         }
 
+                        MediaBuffer *newBuf = NULL;
                         ret = mGroup->acquire_buffer(
-                                &transferBuf, false /* nonBlocking */, usedSize);
-                        if (ret != OK || transferBuf == NULL || transferBuf->mMemory == NULL) {
+                                &newBuf, false /* nonBlocking */, usedSize);
+                        if (ret != OK || newBuf == NULL || newBuf->mMemory == NULL) {
                             ALOGW("failed to acquire shared memory, ret %d", ret);
+                            buf->release();
+                            if (newBuf != NULL) {
+                                newBuf->release();
+                            }
                             reply->writeInt32(NULL_BUFFER);
                             return NO_ERROR;
                         }
+                        transferBuf = newBuf;
                         memcpy(transferBuf->data(), (uint8_t*)buf->data() + buf->range_offset(),
                                 buf->range_length());
                         offset = 0;