[libav-stable] avresample: Make sure the even check does not overflow

Luca Barbato git at libav.org
Sat Oct 18 17:21:01 CEST 2014


Module: libav
Branch: master
Commit: 963f76144897d3f7684d82ec21e51dd50ea1106e

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:      Wed Oct 15 17:32:57 2014 +0100

avresample: Make sure the even check does not overflow

CC: libav-stable at libav.org
Bug-Id: CID 732225

---

 libavresample/audio_mix_matrix.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c
index 487869b..5182ae1 100644
--- a/libavresample/audio_mix_matrix.c
+++ b/libavresample/audio_mix_matrix.c
@@ -60,7 +60,7 @@
 
 static av_always_inline int even(uint64_t layout)
 {
-    return (!layout || (layout & (layout - 1)));
+    return (!layout || !!(layout & (layout - 1)));
 }
 
 static int sane_layout(uint64_t layout)



More information about the libav-stable mailing list