commit 7bccf8fae931036a7289ff3c0ab79c25482c2420
author Marco Nelissen <marcone@google.com> Tue Oct 31 17:00:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 17:00:54 2017 +0000
tree 16024f09d60bf22adf209e312a41a14c153c41b2
parent 302d2e5cd4988d3f9c46e68caef2e0da79486bfa
parent f15220d4fc7fc9fbf0f7f9d21223ad0c58400db7

Merge "Fix edge case when applying id3 unsynchronization" into lmp-dev am: 4c75797abd am: fea0a3bb6d
am: f15220d4fc

Change-Id: Ic64ef2f8511ee6cd71c5cf2040c82129d2c2e182

media/libstagefright/id3/ID3.cpp

diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp
index 667b83e..3ea6c38 100644
--- a/media/libstagefright/id3/ID3.cpp
+++ b/media/libstagefright/id3/ID3.cpp
@@ -392,7 +392,12 @@
                     --mSize;
                     --dataSize;
                 }
-                mData[writeOffset++] = mData[readOffset++];
+                if (i + 1 < dataSize) {
+                    // Only move data if there's actually something to move.
+                    // This handles the special case of the data being only [0xff, 0x00]
+                    // which should be converted to just 0xff if unsynchronization is on.
+                    mData[writeOffset++] = mData[readOffset++];
+                }
             }
             // move the remaining data following this frame
             if (readOffset <= oldSize) {