diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:13:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:13:31 -0700 |
| commit | eb8cffd91add5dafd12d58611b494172aad9b07e (patch) | |
| tree | e158c52828130a41acece15ac9b4f10ea39587ff | |
| parent | 88ed043d320a8771b102f984e57a88e372b4b934 (diff) | |
| parent | 1e357f4610e788c3e5dea5dd2f01b26bb75c5e36 (diff) | |
| download | frameworks_av-eb8cffd91add5dafd12d58611b494172aad9b07e.zip frameworks_av-eb8cffd91add5dafd12d58611b494172aad9b07e.tar.gz frameworks_av-eb8cffd91add5dafd12d58611b494172aad9b07e.tar.bz2 | |
am 1e357f46: am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit '1e357f4610e788c3e5dea5dd2f01b26bb75c5e36':
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 * |