summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Woelders <kim@woelders.dk>2016-04-07 16:32:34 +0200
committerKim Woelders <kim@woelders.dk>2016-04-07 20:20:47 +0200
commit5b5544ab7716b1912954092fe031331cdc1df9d3 (patch)
tree6d5a47b73465d35025909605be93e9fbc084386a
parentce94edca1ccfbe314cb7cd9453433fad404ec7ef (diff)
downloadimlib2-5b5544ab7716b1912954092fe031331cdc1df9d3.tar.gz
Revert "gif: fix oob reads w/bad colormaps"
This reverts commit 16de244bd03d2f75da6508feb1ad9cb4e668e9dc. Will push alternative solution.
-rw-r--r--src/modules/loaders/loader_gif.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
index 7bdf29c..638df59 100644
--- a/src/modules/loaders/loader_gif.c
+++ b/src/modules/loaders/loader_gif.c
@@ -170,16 +170,9 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity,
}
else
{
- if (rows[i][j] < cmap->ColorCount)
- {
- r = cmap->Colors[rows[i][j]].Red;
- g = cmap->Colors[rows[i][j]].Green;
- b = cmap->Colors[rows[i][j]].Blue;
- }
- else
- {
- r = g = b = 0;
- }
+ r = cmap->Colors[rows[i][j]].Red;
+ g = cmap->Colors[rows[i][j]].Green;
+ b = cmap->Colors[rows[i][j]].Blue;
*ptr++ = (0xff << 24) | (r << 16) | (g << 8) | b;
}
per += per_inc;