From 5b5ae13e9e8607d26269077d3781b3628eb7b875 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Tue, 19 Jan 2010 13:52:06 -0800
Subject: [PATCH] Fix trailing garbage after UCS-2 encoded strings in ID3 V2.

related-to-bug: 2381919
---
 media/libstagefright/id3/ID3.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp
index 05479789b621e..6d64717b14b40 100644
--- a/media/libstagefright/id3/ID3.cpp
+++ b/media/libstagefright/id3/ID3.cpp
@@ -335,7 +335,8 @@ void ID3::Iterator::getString(String8 *id) const {
         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);
     }
 }