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

xxan: return 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-17 14:45:00 +00:00
parent 0bf40e0ef4
commit be536f084a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/xxan.c
View File

@ -134,7 +134,7 @@ static int xan_unpack(XanContext *s,
} }
if (dest + size + size2 > dest_end || if (dest + size + size2 > dest_end ||
dest - orig_dest + size < back) dest - orig_dest + size < back)
return -1; return AVERROR_INVALIDDATA;
bytestream2_get_buffer(&s->gb, dest, size); bytestream2_get_buffer(&s->gb, dest, size);
dest += size; dest += size;
av_memcpy_backptr(dest, back, size2); av_memcpy_backptr(dest, back, size2);
@ -144,7 +144,7 @@ static int xan_unpack(XanContext *s,
size = finish ? opcode & 3 : ((opcode & 0x1f) << 2) + 4; size = finish ? opcode & 3 : ((opcode & 0x1f) << 2) + 4;
if (dest_end - dest < size) if (dest_end - dest < size)
return -1; return AVERROR_INVALIDDATA;
bytestream2_get_buffer(&s->gb, dest, size); bytestream2_get_buffer(&s->gb, dest, size);
dest += size; dest += size;
if (finish) if (finish)
@ -168,7 +168,7 @@ static int xan_decode_chroma(AVCodecContext *avctx, unsigned chroma_off)
return 0; return 0;
if (chroma_off + 4 >= bytestream2_get_bytes_left(&s->gb)) { if (chroma_off + 4 >= bytestream2_get_bytes_left(&s->gb)) {
av_log(avctx, AV_LOG_ERROR, "Invalid chroma block position\n"); av_log(avctx, AV_LOG_ERROR, "Invalid chroma block position\n");
return -1; return AVERROR_INVALIDDATA;
} }
bytestream2_seek(&s->gb, chroma_off + 4, SEEK_SET); bytestream2_seek(&s->gb, chroma_off + 4, SEEK_SET);
mode = bytestream2_get_le16(&s->gb); mode = bytestream2_get_le16(&s->gb);
@ -179,7 +179,7 @@ static int xan_decode_chroma(AVCodecContext *avctx, unsigned chroma_off)
if (offset >= bytestream2_get_bytes_left(&s->gb)) { if (offset >= bytestream2_get_bytes_left(&s->gb)) {
av_log(avctx, AV_LOG_ERROR, "Invalid chroma block offset\n"); av_log(avctx, AV_LOG_ERROR, "Invalid chroma block offset\n");
return -1; return AVERROR_INVALIDDATA;
} }
bytestream2_skip(&s->gb, offset); bytestream2_skip(&s->gb, offset);
@ -187,7 +187,7 @@ static int xan_decode_chroma(AVCodecContext *avctx, unsigned chroma_off)
dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size); dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size);
if (dec_size < 0) { if (dec_size < 0) {
av_log(avctx, AV_LOG_ERROR, "Chroma unpacking failed\n"); av_log(avctx, AV_LOG_ERROR, "Chroma unpacking failed\n");
return -1; return AVERROR_INVALIDDATA;
} }
U = s->pic.data[1]; U = s->pic.data[1];
@ -394,7 +394,7 @@ static int xan_decode_frame(AVCodecContext *avctx,
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Unknown frame type %d\n", ftype); av_log(avctx, AV_LOG_ERROR, "Unknown frame type %d\n", ftype);
return -1; return AVERROR_INVALIDDATA;
} }
if (ret) if (ret)
return ret; return ret;