diff options
| author | Nick Kralevich <nnk@google.com> | 2015-06-13 17:03:06 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-06-13 17:36:11 -0700 |
| commit | 938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3 (patch) | |
| tree | 6b1ab91af2925ec43021109dc8b514073f2ad482 /media/libstagefright/ACodec.cpp | |
| parent | 0907d87dca62cd5bc12d26892c411b7140d148b0 (diff) | |
| download | frameworks_av-938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3.zip frameworks_av-938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3.tar.gz frameworks_av-938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3.tar.bz2 | |
don't trigger an integer underflow when decrementing.
When decrementing "i", eventually i will equal zero. When that
happens, i-- underflows. This causes a crash when code which uses
clang's -fsanitize=unsigned-integer-overflow is run.
Avoid trigging an unsigned integer underflow.
Change-Id: I61709cb01f56fdb36d631aa95579e8bd09cafd12
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index f7d89e4..527e9cd 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1396,7 +1396,8 @@ ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() { status_t ACodec::freeBuffersOnPort(OMX_U32 portIndex) { status_t err = OK; - for (size_t i = mBuffers[portIndex].size(); i-- > 0;) { + for (size_t i = mBuffers[portIndex].size(); i > 0;) { + i--; status_t err2 = freeBuffer(portIndex, i); if (err == OK) { err = err2; @@ -1410,7 +1411,8 @@ status_t ACodec::freeBuffersOnPort(OMX_U32 portIndex) { status_t ACodec::freeOutputBuffersNotOwnedByComponent() { status_t err = OK; - for (size_t i = mBuffers[kPortIndexOutput].size(); i-- > 0;) { + for (size_t i = mBuffers[kPortIndexOutput].size(); i > 0;) { + i--; BufferInfo *info = &mBuffers[kPortIndexOutput].editItemAt(i); |