diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-16 09:09:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-16 09:09:33 -0700 |
| commit | 57be3741eee1899226e6dfd9d6b755a2ffe3109f (patch) | |
| tree | e0e121b0375a421aba09867c570677da9abe1616 /media | |
| parent | 804b4bfb9b9f991a3a74c21210f93573d13eab3d (diff) | |
| parent | cfec88d5a7806381da0dd1aadc3545727a3e79be (diff) | |
| download | frameworks_av-57be3741eee1899226e6dfd9d6b755a2ffe3109f.zip frameworks_av-57be3741eee1899226e6dfd9d6b755a2ffe3109f.tar.gz frameworks_av-57be3741eee1899226e6dfd9d6b755a2ffe3109f.tar.bz2 | |
Merge "stagefright: Add null check before passing meta data buffer"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index e8abf48..7da5a9f 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -360,7 +360,11 @@ status_t SurfaceMediaSource::read( mNumFramesEncoded++; // Pass the data to the MediaBuffer. Pass in only the metadata - + if (mSlots[mCurrentSlot].mGraphicBuffer == NULL) { + ALOGV("Read: SurfaceMediaSource mGraphicBuffer is null. Returning" + "ERROR_END_OF_STREAM."); + return ERROR_END_OF_STREAM; + } passMetadataBuffer(buffer, mSlots[mCurrentSlot].mGraphicBuffer->handle); (*buffer)->setObserver(this); |