highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

j2kenc: fix coded_frame and prevent null pointer dereference.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-27 19:24:31 +02:00
parent 40923e1567
commit e6aed5f404
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/j2kenc.c
View File

@ -59,7 +59,7 @@ typedef struct {
typedef struct { typedef struct {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame *picture; AVFrame picture;
int width, height; ///< image width and height int width, height; ///< image width and height
uint8_t cbps[4]; ///< bits per sample in particular components uint8_t cbps[4]; ///< bits per sample in particular components
@ -394,18 +394,18 @@ static void copy_frame(J2kEncoderContext *s)
for (compno = 0; compno < s->ncomponents; compno++){ for (compno = 0; compno < s->ncomponents; compno++){
J2kComponent *comp = tile->comp + compno; J2kComponent *comp = tile->comp + compno;
int *dst = comp->data; int *dst = comp->data;
line = s->picture->data[compno] line = s->picture.data[compno]
+ comp->coord[1][0] * s->picture->linesize[compno] + comp->coord[1][0] * s->picture.linesize[compno]
+ comp->coord[0][0]; + comp->coord[0][0];
for (y = comp->coord[1][0]; y < comp->coord[1][1]; y++){ for (y = comp->coord[1][0]; y < comp->coord[1][1]; y++){
uint8_t *ptr = line; uint8_t *ptr = line;
for (x = comp->coord[0][0]; x < comp->coord[0][1]; x++) for (x = comp->coord[0][0]; x < comp->coord[0][1]; x++)
*dst++ = *ptr++ - (1 << 7); *dst++ = *ptr++ - (1 << 7);
line += s->picture->linesize[compno]; line += s->picture.linesize[compno];
} }
} }
} else{ } else{
line = s->picture->data[0] + tile->comp[0].coord[1][0] * s->picture->linesize[0] line = s->picture.data[0] + tile->comp[0].coord[1][0] * s->picture.linesize[0]
+ tile->comp[0].coord[0][0] * s->ncomponents; + tile->comp[0].coord[0][0] * s->ncomponents;
i = 0; i = 0;
@ -416,7 +416,7 @@ static void copy_frame(J2kEncoderContext *s)
tile->comp[compno].data[i] = *ptr++ - (1 << 7); tile->comp[compno].data[i] = *ptr++ - (1 << 7);
} }
} }
line += s->picture->linesize[0]; line += s->picture.linesize[0];
} }
} }
} }
@ -926,9 +926,10 @@ static int encode_frame(AVCodecContext *avctx,
s->buf = s->buf_start = buf; s->buf = s->buf_start = buf;
s->buf_end = buf + buf_size; s->buf_end = buf + buf_size;
s->picture = data; s->picture = *(AVFrame*)data;
avctx->coded_frame= &s->picture;
s->lambda = s->picture->quality * LAMBDA_SCALE; s->lambda = s->picture.quality * LAMBDA_SCALE;
copy_frame(s); copy_frame(s);
reinit(s); reinit(s);