diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-10 11:17:23 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-10 11:17:23 -0700 |
| commit | ff1f66966879e612660387285b7ead9c040ff88f (patch) | |
| tree | f4263db3bc1eedcdde086934dc17652795f9e0de /src/images | |
| parent | 7ef57352294644757b279dd22931b6f82a78c6ba (diff) | |
| parent | 97615b8c5e62abbb520ab3d538f78b420994f6b4 (diff) | |
| download | external_skia-ff1f66966879e612660387285b7ead9c040ff88f.zip external_skia-ff1f66966879e612660387285b7ead9c040ff88f.tar.gz external_skia-ff1f66966879e612660387285b7ead9c040ff88f.tar.bz2 | |
merge from open-source master
Change-Id: I064902aa9745342ccfe868331ccc000767e92fc0
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder_libgif.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/images/SkImageDecoder_libgif.cpp b/src/images/SkImageDecoder_libgif.cpp index d2470cc..75a9ee0 100644 --- a/src/images/SkImageDecoder_libgif.cpp +++ b/src/images/SkImageDecoder_libgif.cpp @@ -117,6 +117,11 @@ static const ColorMapObject* find_colormap(const GifFileType* gif) { if (NULL == cmap) { cmap = gif->SColorMap; } + + if (NULL == cmap) { + // no colormap found + return NULL; + } // some sanity checks if (cmap && ((unsigned)cmap->ColorCount > 256 || cmap->ColorCount != (1 << cmap->BitsPerPixel))) { |