commit 65c49d5b382de4085ee5668732bcb0f6ecaf7148
author Vignesh Venkatasubramanian <vigneshv@google.com> Mon Jan 11 15:42:44 2016 -0800
committer The Android Automerger <android-build@google.com> Thu Apr 21 19:09:48 2016 -0700
tree 1cf0d9f4e90df947e65f0c156719a80a7d705d39
parent 0b489d9457b668909fb5121ffad12c8bbd03281d

Fix ParseElementHeader to support 0 payload elements

Cherry-pick'ing Change 5c83bbec9a5f6f00a349674ddad85b753d2ea219
from upstream. This fixes regression in some edge cases for mkv
playback.

BUG=26499283

Change-Id: I88de03219a3d941b6b2f251d384e29c36bdd4d9b

libwebm/mkvparser.cpp

diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp
index e50322b..651dc8f 100644
--- a/libwebm/mkvparser.cpp
+++ b/libwebm/mkvparser.cpp
@@ -318,7 +318,7 @@
 
   // pos now designates payload
 
-  if (stop >= 0 && pos >= stop)
+  if (stop >= 0 && pos > stop)
     return E_FILE_FORMAT_INVALID;
 
   return 0;  // success