commit 5daa75a974735b53fe1f5adf078aa0bd9f4a11d4
author Marco Nelissen <marcone@google.com> Tue Jun 05 17:43:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 05 17:43:45 2018 -0700
tree 2feb993c4d8c486f69c94dfa190b0a5ae5193eb1
parent 8c563d01a99335d16985ccf58e0d2d2e317c1610
parent ee82a4b036cd3b673c104575a458a52f3c162c65

Merge changes from topic "am-92cbb3f7-167f-4f57-b682-f916686fead9-mnc-dev" into oc-dev am: 91abb3dac8 am: 767b86ffd7
am: ee82a4b036

Change-Id: I01835f895f19c8f1782c078d31002d4b01d835b8

media/libstagefright/id3/ID3.cpp

diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp
index f615500..a0a62f4 100644
--- a/media/libstagefright/id3/ID3.cpp
+++ b/media/libstagefright/id3/ID3.cpp
@@ -607,6 +607,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) {