diff options
| author | 2010-01-19 14:05:46 -0800 | |
|---|---|---|
| committer | 2010-01-19 14:05:46 -0800 | |
| commit | 56d42582f20efce1ff46ea2b5fff60b26cf2c1f0 (patch) | |
| tree | 671411bbfd94bdb43a024daa1d67724b75f85a02 | |
| parent | 716bda8fd0a91d0a27f6c1da4af2584965cb287b (diff) | |
| parent | 5b5ae13e9e8607d26269077d3781b3628eb7b875 (diff) | |
Merge "Fix trailing garbage after UCS-2 encoded strings in ID3 V2."
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 05479789b621..6d64717b14b4 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); } } |