projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40ee4de
)
imc: Catch a division by zero
author
Luca Barbato
<lu_zero@gentoo.org>
Tue, 9 Jul 2013 07:18:16 +0000
(09:18 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Fri, 13 Sep 2013 13:49:23 +0000
(15:49 +0200)
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit
bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7
)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/imc.c
libavcodec/imc.c
patch
|
blob
|
history
diff --git
a/libavcodec/imc.c
b/libavcodec/imc.c
index ff8e31e9e64ac485ae918b8f4607eb0dfd18aefd..bee38b07f87f559b3efba791fe4e75b0f5c1751b 100644
(file)
--- a/
libavcodec/imc.c
+++ b/
libavcodec/imc.c
@@
-365,6
+365,10
@@
static int bit_allocation (IMCContext* q, int stream_format_code, int freebits,
iacc += q->bandWidthT[i];
summa += q->bandWidthT[i] * q->flcoeffs4[i];
}
+
+ if (!iacc)
+ return AVERROR_INVALIDDATA;
+
q->bandWidthT[BANDS-1] = 0;
summa = (summa * 0.5 - freebits) / iacc;