commit 1b97976a698b77b880fab967ad47696483c4c6c1
author Ivan Lozano <ivanlozano@google.com> Tue Jan 16 20:27:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 16 20:27:23 2018 +0000
tree a9dbfdbf1c0a25c1cbc77267c12b3a6ecf85473c
parent 18977849c84ed47252e73b06c6122753fb5ab699
parent d7a9d5ffbbec0c68b8bc4fdd72d1dee88511923e

Merge "Fix overflow sanitizer in Visualizer_command."

media/libeffects/visualizer/EffectVisualizer.cpp

diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp
index c33f9f5..807f24d 100644
--- a/media/libeffects/visualizer/EffectVisualizer.cpp
+++ b/media/libeffects/visualizer/EffectVisualizer.cpp
@@ -594,7 +594,9 @@
                     deltaSmpl = CAPTURE_BUF_SIZE;
                 }
 
-                int32_t capturePoint = (int32_t)pContext->mCaptureIdx - deltaSmpl;
+                int32_t capturePoint;
+                //capturePoint = (int32_t)pContext->mCaptureIdx - deltaSmpl;
+                __builtin_sub_overflow((int32_t)pContext->mCaptureIdx, deltaSmpl, &capturePoint);
                 // a negative capturePoint means we wrap the buffer.
                 if (capturePoint < 0) {
                     uint32_t size = -capturePoint;