RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2012-09-20 13:40:47 +02:00
parent 1df2e3c707 c9a39cec70
commit a16c512374
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/matroskadec.c
View File

@ -1053,7 +1053,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
int olen; int olen;
if (pkt_size >= 10000000U) if (pkt_size >= 10000000U)
return -1; return AVERROR_INVALIDDATA;
switch (encodings[0].compression.algo) { switch (encodings[0].compression.algo) {
case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: { 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; olen = pkt_size *= 3;
newpktdata = av_realloc(pkt_data, pkt_size + AV_LZO_OUTPUT_PADDING); newpktdata = av_realloc(pkt_data, pkt_size + AV_LZO_OUTPUT_PADDING);
if (!newpktdata) { if (!newpktdata) {
result = AVERROR(ENOMEM);
goto failed; goto failed;
} }
pkt_data = newpktdata; pkt_data = newpktdata;
result = av_lzo1x_decode(pkt_data, &olen, data, &isize); result = av_lzo1x_decode(pkt_data, &olen, data, &isize);
} while (result==AV_LZO_OUTPUT_FULL && pkt_size<10000000); } while (result==AV_LZO_OUTPUT_FULL && pkt_size<10000000);
if (result) if (result) {
result = AVERROR_INVALIDDATA;
goto failed; goto failed;
}
pkt_size -= olen; pkt_size -= olen;
break; break;
#if CONFIG_ZLIB #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); } while (result==Z_OK && pkt_size<10000000);
pkt_size = zstream.total_out; pkt_size = zstream.total_out;
inflateEnd(&zstream); 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; goto failed;
}
break; break;
} }
#endif #endif
@ -1144,13 +1152,18 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
} while (result==BZ_OK && pkt_size<10000000); } while (result==BZ_OK && pkt_size<10000000);
pkt_size = bzstream.total_out_lo32; pkt_size = bzstream.total_out_lo32;
BZ2_bzDecompressEnd(&bzstream); 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; goto failed;
}
break; break;
} }
#endif #endif
default: default:
return -1; return AVERROR_INVALIDDATA;
} }
*buf = pkt_data; *buf = pkt_data;
@ -1158,7 +1171,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
return 0; return 0;
failed: failed:
av_free(pkt_data); av_free(pkt_data);
return -1; return result;
} }
static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska, static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,