diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-02-09 23:16:09 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-02-09 23:16:09 +0000 |
| commit | a5ed4c7ef4765436128bbeb6cb09a2c096f67141 (patch) | |
| tree | 7df7caed5057fbeab822683980940132a144f586 | |
| parent | cb659dbb96d5544c2f285d7586595f64d82771eb (diff) | |
| parent | 98a14c56a836f110db07c010580ea87e0579bab4 (diff) | |
| download | ex-a5ed4c7ef4765436128bbeb6cb09a2c096f67141.tar.gz | |
[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8
Change-Id: Iaa184524850b1d3dcc0668b09edda47dbb168ded
| -rw-r--r-- | framesequence/jni/FrameSequence_gif.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/framesequence/jni/FrameSequence_gif.cpp b/framesequence/jni/FrameSequence_gif.cpp index 3ba09dca..ed478342 100644 --- a/framesequence/jni/FrameSequence_gif.cpp +++ b/framesequence/jni/FrameSequence_gif.cpp @@ -111,12 +111,14 @@ FrameSequence_gif::FrameSequence_gif(Stream* stream) : } #endif - if (mGif->SColorMap) { + const ColorMapObject* cmap = mGif->SColorMap; + if (cmap) { // calculate bg color GraphicsControlBlock gcb; DGifSavedExtensionToGCB(mGif, 0, &gcb); - if (gcb.TransparentColor == NO_TRANSPARENT_COLOR) { - mBgColor = gifColorToColor8888(mGif->SColorMap->Colors[mGif->SBackGroundColor]); + if (gcb.TransparentColor == NO_TRANSPARENT_COLOR + && mGif->SBackGroundColor < cmap->ColorCount) { + mBgColor = gifColorToColor8888(cmap->Colors[mGif->SBackGroundColor]); } } } @@ -358,4 +360,3 @@ static RegistryEntry gEntry = { acceptsBuffers, }; static Registry gRegister(gEntry); - |