generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pnmdec: use more meaningful error codes

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-10-22 22:00:41 +00:00
parent 5442c6cce3
commit e2820d99f2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/pnmdec.c
View File

@ -34,29 +34,29 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
AVFrame * const p = &s->picture; AVFrame * const p = &s->picture;
int i, j, n, linesize, h, upgrade = 0, is_mono = 0; int i, j, n, linesize, h, upgrade = 0, is_mono = 0;
unsigned char *ptr; unsigned char *ptr;
int components, sample_len; int components, sample_len, ret;
s->bytestream_start = s->bytestream_start =
s->bytestream = (uint8_t *)buf; s->bytestream = (uint8_t *)buf;
s->bytestream_end = (uint8_t *)buf + buf_size; s->bytestream_end = (uint8_t *)buf + buf_size;
if (ff_pnm_decode_header(avctx, s) < 0) if (ff_pnm_decode_header(avctx, s) < 0)
return -1; return AVERROR_INVALIDDATA;
if (p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
p->reference = 0; p->reference = 0;
if (avctx->get_buffer(avctx, p) < 0) { if ((ret = avctx->get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
p->pict_type = AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1; p->key_frame = 1;
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
default: default:
return -1; return AVERROR_INVALIDDATA;
case AV_PIX_FMT_RGBA64BE: case AV_PIX_FMT_RGBA64BE:
n = avctx->width * 8; n = avctx->width * 8;
components=4; components=4;
@ -107,7 +107,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
ptr = p->data[0]; ptr = p->data[0];
linesize = p->linesize[0]; linesize = p->linesize[0];
if (s->bytestream + n * avctx->height > s->bytestream_end) if (s->bytestream + n * avctx->height > s->bytestream_end)
return -1; return AVERROR_INVALIDDATA;
if(s->type < 4 || (is_mono && s->type==7)){ if(s->type < 4 || (is_mono && s->type==7)){
for (i=0; i<avctx->height; i++) { for (i=0; i<avctx->height; i++) {
PutBitContext pb; PutBitContext pb;
@ -119,7 +119,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
while(s->bytestream < s->bytestream_end && (*s->bytestream < '0' || *s->bytestream > '9' )) while(s->bytestream < s->bytestream_end && (*s->bytestream < '0' || *s->bytestream > '9' ))
s->bytestream++; s->bytestream++;
if(s->bytestream >= s->bytestream_end) if(s->bytestream >= s->bytestream_end)
return -1; return AVERROR_INVALIDDATA;
if (is_mono) { if (is_mono) {
/* read a single digit */ /* read a single digit */
v = (*s->bytestream++)&1; v = (*s->bytestream++)&1;
@ -163,7 +163,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
ptr = p->data[0]; ptr = p->data[0];
linesize = p->linesize[0]; linesize = p->linesize[0];
if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end) if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
return -1; return AVERROR_INVALIDDATA;
for (i = 0; i < avctx->height; i++) { for (i = 0; i < avctx->height; i++) {
memcpy(ptr, s->bytestream, n); memcpy(ptr, s->bytestream, n);
s->bytestream += n; s->bytestream += n;