commit f15220d4fc7fc9fbf0f7f9d21223ad0c58400db7
author Marco Nelissen <marcone@google.com> Tue Oct 31 16:58:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 16:58:52 2017 +0000
tree 2518c316aefb85bf96b20214b8a7e47d8e454eb4
parent 66cbab1f138818bdecbaffc08e6808d9939219aa
parent fea0a3bb6d0e6e4403bf7481e5baaeaf9be91f5b

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

Change-Id: I742c7ac17992fb59aeeeecadff6c798b55344cc5

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) {