virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

dfa: use more meaningful return codes

Browse Source
This commit is contained in:
Kostya Shishkov 2012-05-06 09:46:19 +02:00
parent 71a3c59ed7
commit fb5c1aaea6
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libavcodec/dfa.c
View File

@ -49,7 +49,7 @@ static int decode_copy(GetByteContext *gb, uint8_t *frame, int width, int height
const int size = width * height; const int size = width * height;
if (bytestream2_get_buffer(gb, frame, size) != size) if (bytestream2_get_buffer(gb, frame, size) != size)
return -1; return AVERROR_INVALIDDATA;
return 0; return 0;
} }
@ -64,23 +64,23 @@ static int decode_tsw1(GetByteContext *gb, uint8_t *frame, int width, int height
segments = bytestream2_get_le32(gb); segments = bytestream2_get_le32(gb);
offset = bytestream2_get_le32(gb); offset = bytestream2_get_le32(gb);
if (frame_end - frame <= offset) if (frame_end - frame <= offset)
return -1; return AVERROR_INVALIDDATA;
frame += offset; frame += offset;
while (segments--) { while (segments--) {
if (bytestream2_get_bytes_left(gb) < 2) if (bytestream2_get_bytes_left(gb) < 2)
return -1; return AVERROR_INVALIDDATA;
if (mask == 0x10000) { if (mask == 0x10000) {
bitbuf = bytestream2_get_le16u(gb); bitbuf = bytestream2_get_le16u(gb);
mask = 1; mask = 1;
} }
if (frame_end - frame < 2) if (frame_end - frame < 2)
return -1; return AVERROR_INVALIDDATA;
if (bitbuf & mask) { if (bitbuf & mask) {
v = bytestream2_get_le16(gb); v = bytestream2_get_le16(gb);
offset = (v & 0x1FFF) << 1; offset = (v & 0x1FFF) << 1;
count = ((v >> 13) + 2) << 1; count = ((v >> 13) + 2) << 1;
if (frame - frame_start < offset || frame_end - frame < count) if (frame - frame_start < offset || frame_end - frame < count)
return -1; return AVERROR_INVALIDDATA;
av_memcpy_backptr(frame, offset, count); av_memcpy_backptr(frame, offset, count);
frame += count; frame += count;
} else { } else {
@ -103,19 +103,19 @@ static int decode_dsw1(GetByteContext *gb, uint8_t *frame, int width, int height
segments = bytestream2_get_le16(gb); segments = bytestream2_get_le16(gb);
while (segments--) { while (segments--) {
if (bytestream2_get_bytes_left(gb) < 2) if (bytestream2_get_bytes_left(gb) < 2)
return -1; return AVERROR_INVALIDDATA;
if (mask == 0x10000) { if (mask == 0x10000) {
bitbuf = bytestream2_get_le16u(gb); bitbuf = bytestream2_get_le16u(gb);
mask = 1; mask = 1;
} }
if (frame_end - frame < 2) if (frame_end - frame < 2)
return -1; return AVERROR_INVALIDDATA;
if (bitbuf & mask) { if (bitbuf & mask) {
v = bytestream2_get_le16(gb); v = bytestream2_get_le16(gb);
offset = (v & 0x1FFF) << 1; offset = (v & 0x1FFF) << 1;
count = ((v >> 13) + 2) << 1; count = ((v >> 13) + 2) << 1;
if (frame - frame_start < offset || frame_end - frame < count) if (frame - frame_start < offset || frame_end - frame < count)
return -1; return AVERROR_INVALIDDATA;
// can't use av_memcpy_backptr() since it can overwrite following pixels // can't use av_memcpy_backptr() since it can overwrite following pixels
for (v = 0; v < count; v++) for (v = 0; v < count; v++)
frame[v] = frame[v - offset]; frame[v] = frame[v - offset];
@ -142,19 +142,19 @@ static int decode_dds1(GetByteContext *gb, uint8_t *frame, int width, int height
segments = bytestream2_get_le16(gb); segments = bytestream2_get_le16(gb);
while (segments--) { while (segments--) {
if (bytestream2_get_bytes_left(gb) < 2) if (bytestream2_get_bytes_left(gb) < 2)
return -1; return AVERROR_INVALIDDATA;
if (mask == 0x10000) { if (mask == 0x10000) {
bitbuf = bytestream2_get_le16u(gb); bitbuf = bytestream2_get_le16u(gb);
mask = 1; mask = 1;
} }
if (frame_end - frame < 2) if (frame_end - frame < 2)
return -1; return AVERROR_INVALIDDATA;
if (bitbuf & mask) { if (bitbuf & mask) {
v = bytestream2_get_le16(gb); v = bytestream2_get_le16(gb);
offset = (v & 0x1FFF) << 2; offset = (v & 0x1FFF) << 2;
count = ((v >> 13) + 2) << 1; count = ((v >> 13) + 2) << 1;
if (frame - frame_start < offset || frame_end - frame < count*2 + width) if (frame - frame_start < offset || frame_end - frame < count*2 + width)
return -1; return AVERROR_INVALIDDATA;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
frame[0] = frame[1] = frame[0] = frame[1] =
frame[width] = frame[width + 1] = frame[-offset]; frame[width] = frame[width + 1] = frame[-offset];
@ -186,32 +186,32 @@ static int decode_bdlt(GetByteContext *gb, uint8_t *frame, int width, int height
count = bytestream2_get_le16(gb); count = bytestream2_get_le16(gb);
if (count >= height) if (count >= height)
return -1; return AVERROR_INVALIDDATA;
frame += width * count; frame += width * count;
lines = bytestream2_get_le16(gb); lines = bytestream2_get_le16(gb);
if (count + lines > height) if (count + lines > height)
return -1; return AVERROR_INVALIDDATA;
while (lines--) { while (lines--) {
if (bytestream2_get_bytes_left(gb) < 1) if (bytestream2_get_bytes_left(gb) < 1)
return -1; return AVERROR_INVALIDDATA;
line_ptr = frame; line_ptr = frame;
frame += width; frame += width;
segments = bytestream2_get_byteu(gb); segments = bytestream2_get_byteu(gb);
while (segments--) { while (segments--) {
if (frame - line_ptr <= bytestream2_peek_byte(gb)) if (frame - line_ptr <= bytestream2_peek_byte(gb))
return -1; return AVERROR_INVALIDDATA;
line_ptr += bytestream2_get_byte(gb); line_ptr += bytestream2_get_byte(gb);
count = (int8_t)bytestream2_get_byte(gb); count = (int8_t)bytestream2_get_byte(gb);
if (count >= 0) { if (count >= 0) {
if (frame - line_ptr < count) if (frame - line_ptr < count)
return -1; return AVERROR_INVALIDDATA;
if (bytestream2_get_buffer(gb, line_ptr, count) != count) if (bytestream2_get_buffer(gb, line_ptr, count) != count)
return -1; return AVERROR_INVALIDDATA;
} else { } else {
count = -count; count = -count;
if (frame - line_ptr < count) if (frame - line_ptr < count)
return -1; return AVERROR_INVALIDDATA;
memset(line_ptr, bytestream2_get_byte(gb), count); memset(line_ptr, bytestream2_get_byte(gb), count);
} }
line_ptr += count; line_ptr += count;
@ -230,17 +230,17 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
lines = bytestream2_get_le16(gb); lines = bytestream2_get_le16(gb);
if (lines > height) if (lines > height)
return -1; return AVERROR_INVALIDDATA;
while (lines--) { while (lines--) {
if (bytestream2_get_bytes_left(gb) < 2) if (bytestream2_get_bytes_left(gb) < 2)
return -1; return AVERROR_INVALIDDATA;
segments = bytestream2_get_le16u(gb); segments = bytestream2_get_le16u(gb);
while ((segments & 0xC000) == 0xC000) { while ((segments & 0xC000) == 0xC000) {
unsigned skip_lines = -(int16_t)segments; unsigned skip_lines = -(int16_t)segments;
unsigned delta = -((int16_t)segments * width); unsigned delta = -((int16_t)segments * width);
if (frame_end - frame <= delta || y + lines + skip_lines > height) if (frame_end - frame <= delta || y + lines + skip_lines > height)
return -1; return AVERROR_INVALIDDATA;
frame += delta; frame += delta;
y += skip_lines; y += skip_lines;
segments = bytestream2_get_le16(gb); segments = bytestream2_get_le16(gb);
@ -254,19 +254,19 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
y++; y++;
while (segments--) { while (segments--) {
if (frame - line_ptr <= bytestream2_peek_byte(gb)) if (frame - line_ptr <= bytestream2_peek_byte(gb))
return -1; return AVERROR_INVALIDDATA;
line_ptr += bytestream2_get_byte(gb); line_ptr += bytestream2_get_byte(gb);
count = (int8_t)bytestream2_get_byte(gb); count = (int8_t)bytestream2_get_byte(gb);
if (count >= 0) { if (count >= 0) {
if (frame - line_ptr < count * 2) if (frame - line_ptr < count * 2)
return -1; return AVERROR_INVALIDDATA;
if (bytestream2_get_buffer(gb, line_ptr, count * 2) != count * 2) if (bytestream2_get_buffer(gb, line_ptr, count * 2) != count * 2)
return -1; return AVERROR_INVALIDDATA;
line_ptr += count * 2; line_ptr += count * 2;
} else { } else {
count = -count; count = -count;
if (frame - line_ptr < count * 2) if (frame - line_ptr < count * 2)
return -1; return AVERROR_INVALIDDATA;
v = bytestream2_get_le16(gb); v = bytestream2_get_le16(gb);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
bytestream_put_le16(&line_ptr, v); bytestream_put_le16(&line_ptr, v);
@ -279,7 +279,7 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height
static int decode_unk6(GetByteContext *gb, uint8_t *frame, int width, int height) static int decode_unk6(GetByteContext *gb, uint8_t *frame, int width, int height)
{ {
return -1; return AVERROR_PATCHWELCOME;
} }
static int decode_blck(GetByteContext *gb, uint8_t *frame, int width, int height) static int decode_blck(GetByteContext *gb, uint8_t *frame, int width, int height)
@ -338,7 +338,7 @@ static int dfa_decode_frame(AVCodecContext *avctx,
if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) { if (decoder[chunk_type - 2](&gb, s->frame_buf, avctx->width, avctx->height)) {
av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n", av_log(avctx, AV_LOG_ERROR, "Error decoding %s chunk\n",
chunk_name[chunk_type - 2]); chunk_name[chunk_type - 2]);
return -1; return AVERROR_INVALIDDATA;
} }
} else { } else {
av_log(avctx, AV_LOG_WARNING, "Ignoring unknown chunk type %d\n", av_log(avctx, AV_LOG_WARNING, "Ignoring unknown chunk type %d\n",