commit 08e7eb983fcb9860a574e964ff905f75aab88d2f
author Andreas Huber <andih@google.com> Tue Jan 19 13:52:06 2010 -0800
committer Andreas Huber <andih@google.com> Tue Jan 19 13:52:06 2010 -0800
tree ec6d202e672bf204d4eb586990e6f42d9e12190f
parent 83e5850bdf9c8b5c36c364b367b039674eb827ad

Fix trailing garbage after UCS-2 encoded strings in ID3 V2.

related-to-bug: 2381919

media/libstagefright/id3/ID3.cpp

diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp
index 0547978..6d64717 100644
--- a/media/libstagefright/id3/ID3.cpp
+++ b/media/libstagefright/id3/ID3.cpp
@@ -335,7 +335,8 @@
         convertISO8859ToString8(mFrameData + 1, n, id);
     } else {
         // UCS-2
-        id->setTo((const char16_t *)(mFrameData + 1), n);
+        // API wants number of characters, not number of bytes...
+        id->setTo((const char16_t *)(mFrameData + 1), n / 2);
     }
 }