opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 21:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

cinepack: return non-generic errors

Browse Source
This commit is contained in:
Luca Barbato
2011-11-18 12:10:41 +01:00
parent 81ac4cda0b
commit b7d939d998
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/cinepak.c
View File

@ -147,7 +147,7 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
for (x=strip->x1; x < strip->x2; x+=4) { for (x=strip->x1; x < strip->x2; x+=4) {
if ((chunk_id & 0x01) && !(mask >>= 1)) { if ((chunk_id & 0x01) && !(mask >>= 1)) {
if ((data + 4) > eod) if ((data + 4) > eod)
return -1; return AVERROR_INVALIDDATA;
flag = AV_RB32 (data); flag = AV_RB32 (data);
data += 4; data += 4;
@ -157,7 +157,7 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
if (!(chunk_id & 0x01) || (flag & mask)) { if (!(chunk_id & 0x01) || (flag & mask)) {
if (!(chunk_id & 0x02) && !(mask >>= 1)) { if (!(chunk_id & 0x02) && !(mask >>= 1)) {
if ((data + 4) > eod) if ((data + 4) > eod)
return -1; return AVERROR_INVALIDDATA;
flag = AV_RB32 (data); flag = AV_RB32 (data);
data += 4; data += 4;
@ -166,7 +166,7 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
if ((chunk_id & 0x02) || (~flag & mask)) { if ((chunk_id & 0x02) || (~flag & mask)) {
if (data >= eod) if (data >= eod)
return -1; return AVERROR_INVALIDDATA;
codebook = &strip->v1_codebook[*data++]; codebook = &strip->v1_codebook[*data++];
s->frame.data[0][iy[0] + 0] = codebook->y0; s->frame.data[0][iy[0] + 0] = codebook->y0;
@ -207,7 +207,7 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
} else if (flag & mask) { } else if (flag & mask) {
if ((data + 4) > eod) if ((data + 4) > eod)
return -1; return AVERROR_INVALIDDATA;
codebook = &strip->v4_codebook[*data++]; codebook = &strip->v4_codebook[*data++];
s->frame.data[0][iy[0] + 0] = codebook->y0; s->frame.data[0][iy[0] + 0] = codebook->y0;
@ -272,13 +272,13 @@ static int cinepak_decode_strip (CinepakContext *s,
if (strip->x2 > s->width || if (strip->x2 > s->width ||
strip->y2 > s->height || strip->y2 > s->height ||
strip->x1 >= strip->x2 || strip->y1 >= strip->y2) strip->x1 >= strip->x2 || strip->y1 >= strip->y2)
return -1; return AVERROR_INVALIDDATA;
while ((data + 4) <= eod) { while ((data + 4) <= eod) {
chunk_id = data[0]; chunk_id = data[0];
chunk_size = AV_RB24 (&data[1]) - 4; chunk_size = AV_RB24 (&data[1]) - 4;
if(chunk_size < 0) if(chunk_size < 0)
return -1; return AVERROR_INVALIDDATA;
data += 4; data += 4;
chunk_size = ((data + chunk_size) > eod) ? (eod - data) : chunk_size; chunk_size = ((data + chunk_size) > eod) ? (eod - data) : chunk_size;
@ -311,7 +311,7 @@ static int cinepak_decode_strip (CinepakContext *s,
data += chunk_size; data += chunk_size;
} }
return -1; return AVERROR_INVALIDDATA;
} }
static int cinepak_decode (CinepakContext *s) static int cinepak_decode (CinepakContext *s)
@ -322,7 +322,7 @@ static int cinepak_decode (CinepakContext *s)
int encoded_buf_size; int encoded_buf_size;
if (s->size < 10) if (s->size < 10)
return -1; return AVERROR_INVALIDDATA;
frame_flags = s->data[0]; frame_flags = s->data[0];
num_strips = AV_RB16 (&s->data[8]); num_strips = AV_RB16 (&s->data[8]);
@ -332,7 +332,7 @@ static int cinepak_decode (CinepakContext *s)
if (s->sega_film_skip_bytes == -1) { if (s->sega_film_skip_bytes == -1) {
if (!encoded_buf_size) { if (!encoded_buf_size) {
av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0"); av_log_ask_for_sample(s->avctx, "encoded_buf_size is 0");
return -1; return AVERROR_INVALIDDATA;
} }
if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) { if (encoded_buf_size != s->size && (s->size % encoded_buf_size) != 0) {
/* If the encoded frame size differs from the frame size as indicated /* If the encoded frame size differs from the frame size as indicated
@ -361,7 +361,7 @@ static int cinepak_decode (CinepakContext *s)
for (i=0; i < num_strips; i++) { for (i=0; i < num_strips; i++) {
if ((s->data + 12) > eod) if ((s->data + 12) > eod)
return -1; return AVERROR_INVALIDDATA;
s->strips[i].id = s->data[0]; s->strips[i].id = s->data[0];
s->strips[i].y1 = y0; s->strips[i].y1 = y0;
@ -371,7 +371,7 @@ static int cinepak_decode (CinepakContext *s)
strip_size = AV_RB24 (&s->data[1]) - 12; strip_size = AV_RB24 (&s->data[1]) - 12;
if (strip_size < 0) if (strip_size < 0)
return -1; return AVERROR_INVALIDDATA;
s->data += 12; s->data += 12;
strip_size = ((s->data + strip_size) > eod) ? (eod - s->data) : strip_size; strip_size = ((s->data + strip_size) > eod) ? (eod - s->data) : strip_size;
@ -421,7 +421,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt) AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int ret = 0, buf_size = avpkt->size;
CinepakContext *s = avctx->priv_data; CinepakContext *s = avctx->priv_data;
s->data = buf; s->data = buf;
@ -430,9 +430,9 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
s->frame.reference = 1; s->frame.reference = 1;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE; FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &s->frame)) { if ((ret = avctx->reget_buffer(avctx, &s->frame))) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return ret;
} }
if (s->palette_video) { if (s->palette_video) {