summaryrefslogtreecommitdiff
path: root/jdhuff.c
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2011-02-03 04:19:44 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2011-02-03 04:19:44 +0000
commit51f9cb0a081d51e7bd6e219a30f5cc920362c235 (patch)
treed8fe2c9f5ee982c7b738f8e1f8b2c62675d33270 /jdhuff.c
parentf5b3dd3199f110889059023d5a416829fc0f2e4c (diff)
Cherry-pick a fix from r324 of the libjpeg-turbo stable branch that
adds further protections against invalid Huffman codes. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/6334053 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@73588 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'jdhuff.c')
-rw-r--r--jdhuff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/jdhuff.c b/jdhuff.c
index 04b38d5..0291bc9 100644
--- a/jdhuff.c
+++ b/jdhuff.c
@@ -658,7 +658,7 @@ decode_mcu_slow (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
symbol |= GET_BITS(1); \
size++; \
} \
- symbol = htbl->pub->huffval[ (int) (symbol + htbl->valoffset[size]) ]; \
+ symbol = htbl->pub->huffval[ (int) (symbol + htbl->valoffset[size]) & 0xFF ]; \
} \
}