commit bad0533d2ea29feb710cb8195206a05bf187b69f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 01:54:52 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue Jun 05 01:54:52 2018 +0000
tree a9328c3f02807181a6b055d70c59a88212c25525
parent 27d756fbae17a394b5ef3cf5097d01b12bba3737
parent 4cdd5c3af5a27f90f9bccc04147534918f05f728

[automerger] Fix possible out of bounds read am: 3762e06152 am: ecc92a1a86 am: 1c7bb87a42 am: 4cdd5c3af5

Change-Id: I377cba24b9723397499a1077df22ff018031344f

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) {