| commit | eb8cffd91add5dafd12d58611b494172aad9b07e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 08 13:13:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 13:13:31 2012 -0700 |
| tree | e158c52828130a41acece15ac9b4f10ea39587ff | |
| parent | 88ed043d320a8771b102f984e57a88e372b4b934 [diff] | |
| parent | 1e357f4610e788c3e5dea5dd2f01b26bb75c5e36 [diff] |
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.
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 @@ n += 2; } - return n; + // Add size of null termination. + return n + 2; } const void *