aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-15 01:54:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-15 01:55:21 +0100
commita5adeff45745ec973bb42217a61752dc80d256c4 (patch)
treeaa2f6ee6b473ae31c00a80cfa36bcbc54ff8d618
parentac1735e76dc93386a8015bb982c78509c3625001 (diff)
parent3a6ddfb8745e4b306a5637927fb057f630345e2f (diff)
downloadffmpeg-a5adeff45745ec973bb42217a61752dc80d256c4.tar.gz
Merge commit '3a6ddfb8745e4b306a5637927fb057f630345e2f'
* commit '3a6ddfb8745e4b306a5637927fb057f630345e2f': exr: check return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/exr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 62e8521adc..b56fe2e7f6 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -382,8 +382,9 @@ static int huf_unpack_enc_table(GetByteContext *gb,
int32_t im, int32_t iM, uint64_t *hcode)
{
GetBitContext gbit;
-
- init_get_bits8(&gbit, gb->buffer, bytestream2_get_bytes_left(gb));
+ int ret = init_get_bits8(&gbit, gb->buffer, bytestream2_get_bytes_left(gb));
+ if (ret < 0)
+ return ret;
for (; im <= iM; im++) {
uint64_t l = hcode[im] = get_bits(&gbit, 6);