aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2016-12-07 22:58:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-07 22:58:58 +0000
commitfe5bf1719c9e5eac7d8297c5ac1450f2c5c79c4a (patch)
treee5c19c26fc748743c3956d06a2c0492610f9c3c4
parent8fcb69b9c3786e09a814ba442753e4059881aa5d (diff)
parent68713321b45cdb2198a10a8b8a7bf34577d7e342 (diff)
downloadlibgdx-fe5bf1719c9e5eac7d8297c5ac1450f2c5c79c4a.tar.gz
Fix security vulnerability am: 890381c983 am: e1508f990b am: 9df7875d10
am: 68713321b4 Change-Id: I7f5d9806109ca2a11992e5da7e229d19d79f8c67
-rw-r--r--gdx/jni/gdx2d/jpgd.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/gdx/jni/gdx2d/jpgd.cpp b/gdx/jni/gdx2d/jpgd.cpp
index 3873dfbe2..4c84a3321 100644
--- a/gdx/jni/gdx2d/jpgd.cpp
+++ b/gdx/jni/gdx2d/jpgd.cpp
@@ -2231,7 +2231,10 @@ void jpeg_decoder::make_huff_table(int index, huff_tables *pH)
for (l = 1; l <= 16; l++)
{
for (i = 1; i <= m_huff_num[index][l]; i++)
+ {
+ JPGD_ASSERT(p < 257);
huffsize[p++] = static_cast<uint8>(l);
+ }
}
huffsize[p] = 0;
@@ -2246,6 +2249,7 @@ void jpeg_decoder::make_huff_table(int index, huff_tables *pH)
{
while (huffsize[p] == si)
{
+ JPGD_ASSERT(p < 257);
huffcode[p++] = code;
code++;
}