highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/matroskadec: Cleanup error handling for bz2 & zlib

Browse Source 
Fixes CID703652

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 171af59d58fc67d82dce8ff7ed11fa671108baa5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-12 18:32:12 +02:00
parent 75b21eb8f8
commit 05eddbbc05
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/matroskadec.c
View File

@ -1274,15 +1274,13 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
newpktdata = av_realloc(pkt_data, pkt_size); newpktdata = av_realloc(pkt_data, pkt_size);
if (!newpktdata) { if (!newpktdata) {
inflateEnd(&zstream); inflateEnd(&zstream);
result = AVERROR(ENOMEM);
goto failed; goto failed;
} }
pkt_data = newpktdata; pkt_data = newpktdata;
zstream.avail_out = pkt_size - zstream.total_out; zstream.avail_out = pkt_size - zstream.total_out;
zstream.next_out = pkt_data + zstream.total_out; zstream.next_out = pkt_data + zstream.total_out;
if (pkt_data) { result = inflate(&zstream, Z_NO_FLUSH);
result = inflate(&zstream, Z_NO_FLUSH);
} else
result = Z_MEM_ERROR;
} 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);
@ -1309,15 +1307,13 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
newpktdata = av_realloc(pkt_data, pkt_size); newpktdata = av_realloc(pkt_data, pkt_size);
if (!newpktdata) { if (!newpktdata) {
BZ2_bzDecompressEnd(&bzstream); BZ2_bzDecompressEnd(&bzstream);
result = AVERROR(ENOMEM);
goto failed; goto failed;
} }
pkt_data = newpktdata; pkt_data = newpktdata;
bzstream.avail_out = pkt_size - bzstream.total_out_lo32; bzstream.avail_out = pkt_size - bzstream.total_out_lo32;
bzstream.next_out = pkt_data + bzstream.total_out_lo32; bzstream.next_out = pkt_data + bzstream.total_out_lo32;
if (pkt_data) { result = BZ2_bzDecompress(&bzstream);
result = BZ2_bzDecompress(&bzstream);
} else
result = BZ_MEM_ERROR;
} 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);