diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-01-08 15:58:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-08 15:58:32 +0000 |
| commit | e83a9b9eb6ab2b54a84f9de217fae4770e4f8551 (patch) | |
| tree | eb0a94935d7a84f6396bd368afb0076b0063aa23 | |
| parent | 30f52764023ae9bffb6834c1754a6b622d224dfa (diff) | |
| parent | 94121727f3baceee4e7f5f47bc27a87adb977d43 (diff) | |
| download | libmpeg2-e83a9b9eb6ab2b54a84f9de217fae4770e4f8551.tar.gz | |
Fixed stack buffer overflow am: 8b4ed5a231
am: 94121727f3
* commit '94121727f3baceee4e7f5f47bc27a87adb977d43':
Fixed stack buffer overflow
| -rw-r--r-- | decoder/impeg2d_vld.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/decoder/impeg2d_vld.c b/decoder/impeg2d_vld.c index 972f42a..459548b 100644 --- a/decoder/impeg2d_vld.c +++ b/decoder/impeg2d_vld.c @@ -789,13 +789,13 @@ IMPEG2D_ERROR_CODES_T impeg2d_vld_decode( u4_nz_cols |= 1 << (u4_pos & 0x7); u4_nz_rows |= 1 << (u4_pos >> 0x3); + if (u4_numCoeffs > 64) + { + return IMPEG2D_MB_TEX_DECODE_ERR; + } } IBITS_GET(u4_buf,u4_buf_nxt,u4_offset,u4_bits,pu4_buf_aligned,u4_sym_len) - if (u4_numCoeffs > 64) - { - return IMPEG2D_MB_TEX_DECODE_ERR; - } } else { @@ -957,10 +957,11 @@ IMPEG2D_ERROR_CODES_T impeg2d_vld_decode( u4_nz_cols |= 1 << (u4_pos & 0x7); u4_nz_rows |= 1 << (u4_pos >> 0x3); - } - if (u4_numCoeffs > 64) - { - return IMPEG2D_MB_TEX_DECODE_ERR; + if (u4_numCoeffs > 64) + { + return IMPEG2D_MB_TEX_DECODE_ERR; + } + } IBITS_GET(u4_buf,u4_buf_nxt,u4_offset,u4_bits,pu4_buf_aligned,u4_sym_len) |