virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

pcx: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 17:57:06 +01:00
parent 6bf70127d1
commit a1c525f7eb
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/pcx.c
View File

@ -94,7 +94,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (buf[0] != 0x0a || buf[1] > 5) { if (buf[0] != 0x0a || buf[1] > 5) {
av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n"); av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
return -1; return AVERROR_INVALIDDATA;
} }
compressed = buf[2]; compressed = buf[2];
@ -105,7 +105,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (xmax < xmin || ymax < ymin) { if (xmax < xmin || ymax < ymin) {
av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n"); av_log(avctx, AV_LOG_ERROR, "invalid image dimensions\n");
return -1; return AVERROR_INVALIDDATA;
} }
w = xmax - xmin + 1; w = xmax - xmin + 1;
@ -118,7 +118,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (bytes_per_scanline < w * bits_per_pixel * nplanes / 8) { if (bytes_per_scanline < w * bits_per_pixel * nplanes / 8) {
av_log(avctx, AV_LOG_ERROR, "PCX data is corrupted\n"); av_log(avctx, AV_LOG_ERROR, "PCX data is corrupted\n");
return -1; return AVERROR_INVALIDDATA;
} }
switch ((nplanes<<8) + bits_per_pixel) { switch ((nplanes<<8) + bits_per_pixel) {
@ -136,7 +136,7 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n"); av_log(avctx, AV_LOG_ERROR, "invalid PCX file\n");
return -1; return AVERROR_INVALIDDATA;
} }
buf += 128; buf += 128;
@ -144,13 +144,13 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
if (av_image_check_size(w, h, 0, avctx)) if ((ret = av_image_check_size(w, h, 0, avctx)) < 0)
return -1; return ret;
if (w != avctx->width || h != avctx->height) if (w != avctx->width || h != avctx->height)
avcodec_set_dimensions(avctx, w, h); avcodec_set_dimensions(avctx, w, h);
if (ff_get_buffer(avctx, p) < 0) { if ((ret = ff_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;