diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 12:58:42 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-08 12:58:42 -0700 |
| commit | efee009528f446542d51f1ce50e2189e8a2f71dd (patch) | |
| tree | 0c502480e6e493fe06e741ba10620d871af09b07 /media | |
| parent | a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f (diff) | |
| parent | be5016bac5c1b422d850e299d3cb11fecf0ac19d (diff) | |
| download | frameworks_av-efee009528f446542d51f1ce50e2189e8a2f71dd.zip frameworks_av-efee009528f446542d51f1ce50e2189e8a2f71dd.tar.gz frameworks_av-efee009528f446542d51f1ce50e2189e8a2f71dd.tar.bz2 | |
Merge "Correct ID3::StringSize calculation for UCS-2 data."
Diffstat (limited to 'media')
| -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 * |