diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-11-06 07:35:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-06 07:35:32 -0800 |
| commit | a9e634d0ff69b47449b8b435fdeece7bb8df3d8f (patch) | |
| tree | 849bfecea07918b102148fe70ffe1f51b976265e /media | |
| parent | 14896d6fa21cb76e50b1d6a80527f52067c3a99b (diff) | |
| parent | b987753ada64c5824672ea70f92fe603f849d4b6 (diff) | |
| download | frameworks_av-a9e634d0ff69b47449b8b435fdeece7bb8df3d8f.zip frameworks_av-a9e634d0ff69b47449b8b435fdeece7bb8df3d8f.tar.gz frameworks_av-a9e634d0ff69b47449b8b435fdeece7bb8df3d8f.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); |