summaryrefslogtreecommitdiff
path: root/libavcodec/pcx.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/pcx.c')
-rw-r--r--libavcodec/pcx.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 2174184bce..072d136d81 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -87,6 +87,8 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
bytes_per_scanline;
uint8_t *ptr;
uint8_t const *bufstart = buf;
+ uint8_t *scanline;
+ int ret = -1;
if (buf[0] != 0x0a || buf[1] > 5) {
av_log(avctx, AV_LOG_ERROR, "this is not PCX encoded data\n");
@@ -154,9 +156,11 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
ptr = p->data[0];
stride = p->linesize[0];
- if (nplanes == 3 && bits_per_pixel == 8) {
- uint8_t scanline[bytes_per_scanline];
+ scanline = av_malloc(bytes_per_scanline);
+ if (!scanline)
+ return AVERROR(ENOMEM);
+ if (nplanes == 3 && bits_per_pixel == 8) {
for (y=0; y<h; y++) {
buf = pcx_rle_decode(buf, scanline, bytes_per_scanline, compressed);
@@ -170,7 +174,6 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
} else if (nplanes == 1 && bits_per_pixel == 8) {
- uint8_t scanline[bytes_per_scanline];
const uint8_t *palstart = bufstart + buf_size - 769;
for (y=0; y<h; y++, ptr+=stride) {
@@ -184,11 +187,10 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
if (*buf++ != 12) {
av_log(avctx, AV_LOG_ERROR, "expected palette after image data\n");
- return -1;
+ goto end;
}
} else if (nplanes == 1) { /* all packed formats, max. 16 colors */
- uint8_t scanline[bytes_per_scanline];
GetBitContext s;
for (y=0; y<h; y++) {
@@ -202,7 +204,6 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
} else { /* planar, 4, 8 or 16 colors */
- uint8_t scanline[bytes_per_scanline];
int i;
for (y=0; y<h; y++) {
@@ -230,7 +231,10 @@ static int pcx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
*picture = s->picture;
*data_size = sizeof(AVFrame);
- return buf - bufstart;
+ ret = buf - bufstart;
+end:
+ av_free(scanline);
+ return ret;
}
static av_cold int pcx_end(AVCodecContext *avctx) {