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

jpegdec: check return value of mjpeg_decode_dc() 

Fixes Ticket754

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-15 15:23:38 +01:00
parent d998a6ddee
commit 484b1cdd53
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/mjpegdec.c
View File

@ -673,15 +673,19 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point
s->restart_count = s->restart_interval; s->restart_count = s->restart_interval;
for(i=0;i<3;i++) { for(i=0;i<3;i++) {
int pred; int pred, dc;
topleft[i]= top[i]; topleft[i]= top[i];
top[i]= buffer[mb_x][i]; top[i]= buffer[mb_x][i];
PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
dc = mjpeg_decode_dc(s, s->dc_index[i]);
if(dc == 0xFFFF)
return -1;
left[i]= left[i]=
buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform)); buffer[mb_x][i]= mask & (pred + (dc << point_transform));
} }
if (s->restart_interval && !--s->restart_count) { if (s->restart_interval && !--s->restart_count) {
@ -735,7 +739,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point
linesize= s->linesize[c]; linesize= s->linesize[c];
for(j=0; j<n; j++) { for(j=0; j<n; j++) {
int pred; int pred, dc;
ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
if(y==0 && mb_y==0){ if(y==0 && mb_y==0){
@ -754,7 +758,10 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point
if (s->interlaced && s->bottom_field) if (s->interlaced && s->bottom_field)
ptr += linesize >> 1; ptr += linesize >> 1;
*ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform); dc = mjpeg_decode_dc(s, s->dc_index[i]);
if(dc == 0xFFFF)
return -1;
*ptr= pred + (dc << point_transform);
if (++x == h) { if (++x == h) {
x = 0; x = 0;
@ -765,7 +772,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point
}else{ }else{
for(i=0;i<nb_components;i++) { for(i=0;i<nb_components;i++) {
uint8_t *ptr; uint8_t *ptr;
int n, h, v, x, y, c, j, linesize; int n, h, v, x, y, c, j, linesize, dc;
n = s->nb_blocks[i]; n = s->nb_blocks[i];
c = s->comp_index[i]; c = s->comp_index[i];
h = s->h_scount[i]; h = s->h_scount[i];
@ -779,7 +786,11 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point
ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
*ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform);
dc = mjpeg_decode_dc(s, s->dc_index[i]);
if(dc == 0xFFFF)
return -1;
*ptr= pred + (dc << point_transform);
if (++x == h) { if (++x == h) {
x = 0; x = 0;
y++; y++;