commit b04ca4cb26746339bd18762c22c812c76efedea9
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 01:54:58 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 01:54:58 2018 +0000
tree 4a78e56d2793788e0f64c948b511672dfa39ae31
parent 1a7bebd20702551fa6d2285933f35abd5d7c1f21
parent 8aeab2cad98b5be3a540392d27a99104351a8903

[automerger] Fix possible out of bounds read am: 3762e06152 am: ecc92a1a86 am: 1c7bb87a42 am: 4cdd5c3af5 am: bad0533d2e am: 19d1113bb0 am: 8aeab2cad9

Change-Id: I783c7188d71b1f0bd36320a94fcbd9a9e7e39228

media/libstagefright/id3/ID3.cpp

diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp
index 4e1cdf6..ca2be54 100644
--- a/media/libstagefright/id3/ID3.cpp
+++ b/media/libstagefright/id3/ID3.cpp
@@ -603,6 +603,9 @@
         // UCS-2
         // API wants number of characters, not number of bytes...
         int len = n / 2;
+        if (len == 0) {
+            return;
+        }
         const char16_t *framedata = (const char16_t *) (frameData + 1);
         char16_t *framedatacopy = NULL;
         if (*framedata == 0xfffe) {