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

2010-01-19 14:05:46 -08:00
parent 716bda8fd0 5b5ae13e9e
commit 56d42582f2
1 changed files with 2 additions and 1 deletions
--- 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);
    }
 }