diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2016-01-11 15:42:44 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-04-25 13:01:23 -0700 |
| commit | 260987c90a8102bdc265b5ee8f8a45d0067cbd5d (patch) | |
| tree | 1cf0d9f4e90df947e65f0c156719a80a7d705d39 | |
| parent | 0b489d9457b668909fb5121ffad12c8bbd03281d (diff) | |
| download | libvpx-marshmallow-dr-dragon-release.tar.gz | |
Fix ParseElementHeader to support 0 payload elementsandroid-6.0.1_r63android-6.0.1_r55android-6.0.1_r33marshmallow-dr-dragon-release
Cherry-pick'ing Change 5c83bbec9a5f6f00a349674ddad85b753d2ea219
from upstream. This fixes regression in some edge cases for mkv
playback.
BUG=26499283
Change-Id: I88de03219a3d941b6b2f251d384e29c36bdd4d9b
(cherry picked from commit 41607d2715374e87148a03b3165cdc013d731a42)
| -rw-r--r-- | libwebm/mkvparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp index e50322b15..651dc8fe6 100644 --- a/libwebm/mkvparser.cpp +++ b/libwebm/mkvparser.cpp @@ -318,7 +318,7 @@ long ParseElementHeader(IMkvReader* pReader, long long& pos, // pos now designates payload - if (stop >= 0 && pos >= stop) + if (stop >= 0 && pos > stop) return E_FILE_FORMAT_INVALID; return 0; // success |