diff options
| author | Andreas Huber <andih@google.com> | 2010-01-19 13:52:06 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-01-19 13:52:06 -0800 |
| commit | 08e7eb983fcb9860a574e964ff905f75aab88d2f (patch) | |
| tree | ec6d202e672bf204d4eb586990e6f42d9e12190f /media/libstagefright/id3 | |
| parent | 83e5850bdf9c8b5c36c364b367b039674eb827ad (diff) | |
| download | frameworks_av-08e7eb983fcb9860a574e964ff905f75aab88d2f.zip frameworks_av-08e7eb983fcb9860a574e964ff905f75aab88d2f.tar.gz frameworks_av-08e7eb983fcb9860a574e964ff905f75aab88d2f.tar.bz2 | |
Fix trailing garbage after UCS-2 encoded strings in ID3 V2.
related-to-bug: 2381919
Diffstat (limited to 'media/libstagefright/id3')
| -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 0547978..6d64717 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); } } |