commit bb6b12233dfe5b4564d37a9cf28777ab052f381b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 17 23:25:25 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 17 23:25:25 2023 +0000
tree dc74f2f47a3ebe28906629ab5d5806337e48cb27
parent 3b34152e2434895c2f8fafd5aee53672956f72ee
parent aa1e7a97c7547a835ac3ca9656efac15d9a8a785

Merge "MIDI: Set flag namespace as media_audio" into main

media/libstagefright/colorconversion/ColorConverter.cpp

diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index 6c26c28..e079765 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -1550,7 +1550,8 @@
 
         uint32_t u01, v01, y01, y23, y45, y67, uv0, uv1;
         size_t x = 0;
-        for (; x < src.cropWidth() - 3; x += 4) {
+        // x % 4 is always 0 so x + 3 will never overflow.
+        for (; x + 3 < src.cropWidth(); x += 4) {
             u01 = *((uint32_t*)ptr_u); ptr_u += 2;
             v01 = *((uint32_t*)ptr_v); ptr_v += 2;