diff options
| author | Manoj Kumar AVM <manojavm@codeaurora.org> | 2015-04-30 10:24:11 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-04 15:53:11 -0800 |
| commit | b987753ada64c5824672ea70f92fe603f849d4b6 (patch) | |
| tree | dcd73935892f5e815019ff814aec53745ce1632a /media/libstagefright/SurfaceMediaSource.cpp | |
| parent | 36a5d0626d308c7dd04a6e0c8aa06a91d2398d3e (diff) | |
| download | frameworks_av-b987753ada64c5824672ea70f92fe603f849d4b6.zip frameworks_av-b987753ada64c5824672ea70f92fe603f849d4b6.tar.gz frameworks_av-b987753ada64c5824672ea70f92fe603f849d4b6.tar.bz2 | |
stagefright: Add null check before passing meta data buffer
Add necessary null checks to GraphicBuffer before passing it onto
Metadatabuffer.
Change-Id: I5cf09da4bd316e5c1733023746aa54960a36d8c9
Diffstat (limited to 'media/libstagefright/SurfaceMediaSource.cpp')
| -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); |