diff mbox series

[FFmpeg-devel,2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error

Message ID 20220212211350.3559-2-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/2] tools/target_dec_fuzzer: Adjust threshold for TQI | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Michael Niedermayer Feb. 12, 2022, 9:13 p.m. UTC 
Fixes: Timeout
Fixes: Invalid shift
Fixes: 44548/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-556487680891289

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/jpeglsdec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Paul B Mahol Feb. 12, 2022, 9:27 p.m. UTC | #1 
Please follow code style.
Michael Niedermayer Feb. 15, 2022, 8:03 p.m. UTC | #2 
On Sat, Feb 12, 2022 at 10:27:13PM +0100, Paul B Mahol wrote:
> Please follow code style.

ill add the space between if and ( before applying
also, ill fix the other similar issues in the file in a seperate commit

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 6ca723f797..1766b8f09c 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -200,6 +200,8 @@  static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
 #endif
     ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1,
                                state->qbpp);
+    if(ret < 0)
+        return -0x10000;
 
     /* decode mapped error */
     map = 0;