diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:15:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:15:44 -0700 |
| commit | 1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff (patch) | |
| tree | a42144733930031e9a8d0adaf435fece2902793e | |
| parent | 19678334c346f207a98aa67898c3618569e47f8b (diff) | |
| parent | eb8cffd91add5dafd12d58611b494172aad9b07e (diff) | |
| download | frameworks_av-1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff.zip frameworks_av-1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff.tar.gz frameworks_av-1a02d11d0bae1118d7d8f2a6674f6f21ec3f64ff.tar.bz2 | |
am eb8cffd9: am 1e357f46: am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit 'eb8cffd91add5dafd12d58611b494172aad9b07e':
Correct ID3::StringSize calculation for UCS-2 data.
| -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 ca14054..69274ca 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -743,7 +743,8 @@ static size_t StringSize(const uint8_t *start, uint8_t encoding) { n += 2; } - return n; + // Add size of null termination. + return n + 2; } const void * |