commit 4c902b471facf03d010f0c35bf1aa96c1e6d347e
author Nate Myren <ntmyren@google.com> Fri Mar 12 04:19:25 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 04:19:25 2021 +0000
tree 19104feabe15a9344efe6a2ea8b73074a459809d
parent 1c268a564be88d31824aeb9419332012242ec037
parent 07672253a416c0bcaf1e0d61455e7c9ca47a8915

Merge "Use identity for audio-recordings" into sc-dev am: 07672253a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/13536795

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48a10c86924976496a35f2d80dfe2601d87d36aa

src/jni/rtp/AudioGroup.cpp

diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp
index e57b7f7..bb5111f 100644
--- a/src/jni/rtp/AudioGroup.cpp
+++ b/src/jni/rtp/AudioGroup.cpp
@@ -431,17 +431,15 @@
             return;
         }
         int offset = 12 + ((buffer[0] & 0x0F) << 2);
-        if (offset+2 >= bufferSize) {
+        // length is guaranteed to be <= buffersize, so it is safe with respect
+        // buffer overflow testing as well as offset into uninitialized buffer
+        if (offset + 2 + (int)sizeof(uint16_t) > length) {
             ALOGV("invalid buffer offset: %d", offset+2);
             return;
         }
         if ((buffer[0] & 0x10) != 0) {
             offset += 4 + (ntohs(*(uint16_t *)&buffer[offset + 2]) << 2);
         }
-        if (offset >= bufferSize) {
-            ALOGV("invalid buffer offset: %d", offset);
-            return;
-        }
         if ((buffer[0] & 0x20) != 0) {
             length -= buffer[length - 1];
         }