projects / platform / upstream / libav.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: daef7fe)
avresample: Make sure the even check does not overflow
authorLuca Barbato <lu_zero@gentoo.org>
Wed, 15 Oct 2014 16:32:57 +0000 (17:32 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 12 Jan 2015 22:59:59 +0000 (23:59 +0100)
CC: libav-stable@libav.org
Bug-Id: CID 732225

libavresample/audio_mix_matrix.c patch | blob | history

diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c
index 487869b5fd818fb1eebaa0df02a5686526315e82..5182ae1bf9a646d796276f9140a4a37dd87a2b65 100644 (file)
--- 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)
Domain: Multimedia / Media Content;