RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/jpeglsdec: fix end check for xfrm 

Fixes: out of array access
Fixes: 47871/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMV_fuzzer-5646305956855808

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-06-09 21:13:59 +02:00
parent b7e30a13d4
commit 6a82412bf3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/jpeglsdec.c
View File

@ -484,19 +484,19 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
switch(s->xfrm) { switch(s->xfrm) {
case 1: case 1:
for (x = off; x < w; x += 3) { for (x = off; x + 2 < w; x += 3) {
src[x ] += src[x+1] + 128; src[x ] += src[x+1] + 128;
src[x+2] += src[x+1] + 128; src[x+2] += src[x+1] + 128;
} }
break; break;
case 2: case 2:
for (x = off; x < w; x += 3) { for (x = off; x + 2 < w; x += 3) {
src[x ] += src[x+1] + 128; src[x ] += src[x+1] + 128;
src[x+2] += ((src[x ] + src[x+1])>>1) + 128; src[x+2] += ((src[x ] + src[x+1])>>1) + 128;
} }
break; break;
case 3: case 3:
for (x = off; x < w; x += 3) { for (x = off; x + 2 < w; x += 3) {
int g = src[x+0] - ((src[x+2]+src[x+1])>>2) + 64; int g = src[x+0] - ((src[x+2]+src[x+1])>>2) + 64;
src[x+0] = src[x+2] + g + 128; src[x+0] = src[x+2] + g + 128;
src[x+2] = src[x+1] + g + 128; src[x+2] = src[x+1] + g + 128;
@ -504,7 +504,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
} }
break; break;
case 4: case 4:
for (x = off; x < w; x += 3) { for (x = off; x + 2 < w; x += 3) {
int r = src[x+0] - (( 359 * (src[x+2]-128) + 490) >> 8); int r = src[x+0] - (( 359 * (src[x+2]-128) + 490) >> 8);
int g = src[x+0] - (( 88 * (src[x+1]-128) - 183 * (src[x+2]-128) + 30) >> 8); int g = src[x+0] - (( 88 * (src[x+1]-128) - 183 * (src[x+2]-128) + 30) >> 8);
int b = src[x+0] + ((454 * (src[x+1]-128) + 574) >> 8); int b = src[x+0] + ((454 * (src[x+1]-128) + 574) >> 8);