commit f2adcac3233c0ca68f7a882bfb9ecacb5c2331af
author Dan Austin <danielaustin@google.com> Tue Nov 03 21:33:01 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 03 21:33:01 2015 +0000
tree bf31d274ae321e72f598114f6e0a74d3174debf6
parent 51305b8831aaaf4ef4dbc52e29c6b897bac25b18
parent fc37612e6838d9d9435bbee147c8b0a57d86de18

Merge "Enable fsanitize-unsigned-integer for G711 soft decoder."

media/libstagefright/codecs/g711/dec/Android.mk

diff --git a/media/libstagefright/codecs/g711/dec/Android.mk b/media/libstagefright/codecs/g711/dec/Android.mk
index 2750cb5..b36c99d 100644
--- a/media/libstagefright/codecs/g711/dec/Android.mk
+++ b/media/libstagefright/codecs/g711/dec/Android.mk
@@ -16,6 +16,6 @@
 
 LOCAL_CFLAGS += -Werror
 LOCAL_CLANG := true
-LOCAL_SANITIZE := signed-integer-overflow
+LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
 
 include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codecs/g711/dec/SoftG711.cpp

diff --git a/media/libstagefright/codecs/g711/dec/SoftG711.cpp b/media/libstagefright/codecs/g711/dec/SoftG711.cpp
index 015515e..e342d7c 100644
--- a/media/libstagefright/codecs/g711/dec/SoftG711.cpp
+++ b/media/libstagefright/codecs/g711/dec/SoftG711.cpp
@@ -262,7 +262,8 @@
 // static
 void SoftG711::DecodeALaw(
         int16_t *out, const uint8_t *in, size_t inSize) {
-    while (inSize-- > 0) {
+    while (inSize > 0) {
+        inSize--;
         int32_t x = *in++;
 
         int32_t ix = x ^ 0x55;
@@ -288,7 +289,8 @@
 // static
 void SoftG711::DecodeMLaw(
         int16_t *out, const uint8_t *in, size_t inSize) {
-    while (inSize-- > 0) {
+    while (inSize > 0) {
+        inSize--;
         int32_t x = *in++;
 
         int32_t mantissa = ~x;