diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 13:40:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 13:40:47 +0200 |
| commit | a16c512374ca8c0661fa02818f075e4ac4c15896 (patch) | |
| tree | 86e73958de007cfa7d0172ea864fb82ac17c4698 | |
| parent | 1df2e3c707d394ae28159400374ead8d7230f443 (diff) | |
| parent | c9a39cec70603f662f4c326b21b11c4f0112079a (diff) | |
| download | ffmpeg-a16c512374ca8c0661fa02818f075e4ac4c15896.tar.gz | |
Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'
* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a':
matroskadec: return meaningful errors in matroska_decode_buffer
matroskadec: fix incorrect unsigned->signed conversion
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskadec.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6c059aa24c..2a88fc3db4 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1053,7 +1053,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, int olen; if (pkt_size >= 10000000U) - return -1; + return AVERROR_INVALIDDATA; switch (encodings[0].compression.algo) { case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: { @@ -1082,13 +1082,16 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, olen = pkt_size *= 3; newpktdata = av_realloc(pkt_data, pkt_size + AV_LZO_OUTPUT_PADDING); if (!newpktdata) { + result = AVERROR(ENOMEM); goto failed; } pkt_data = newpktdata; result = av_lzo1x_decode(pkt_data, &olen, data, &isize); } while (result==AV_LZO_OUTPUT_FULL && pkt_size<10000000); - if (result) + if (result) { + result = AVERROR_INVALIDDATA; goto failed; + } pkt_size -= olen; break; #if CONFIG_ZLIB @@ -1115,8 +1118,13 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, } while (result==Z_OK && pkt_size<10000000); pkt_size = zstream.total_out; inflateEnd(&zstream); - if (result != Z_STREAM_END) + if (result != Z_STREAM_END) { + if (result == Z_MEM_ERROR) + result = AVERROR(ENOMEM); + else + result = AVERROR_INVALIDDATA; goto failed; + } break; } #endif @@ -1144,13 +1152,18 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, } while (result==BZ_OK && pkt_size<10000000); pkt_size = bzstream.total_out_lo32; BZ2_bzDecompressEnd(&bzstream); - if (result != BZ_STREAM_END) + if (result != BZ_STREAM_END) { + if (result == BZ_MEM_ERROR) + result = AVERROR(ENOMEM); + else + result = AVERROR_INVALIDDATA; goto failed; + } break; } #endif default: - return -1; + return AVERROR_INVALIDDATA; } *buf = pkt_data; @@ -1158,7 +1171,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, return 0; failed: av_free(pkt_data); - return -1; + return result; } static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska, |