diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:15:29 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:15:29 -0800 |
commit | 831d75e1120e538b6b56dbb71feb277bc811d85d (patch) | |
tree | 1cf0d9f4e90df947e65f0c156719a80a7d705d39 | |
parent | 97350a91ce5d1e677e77bcfd8159aeb7e378015f (diff) | |
parent | 41607d2715374e87148a03b3165cdc013d731a42 (diff) | |
download | android_external_libvpx-831d75e1120e538b6b56dbb71feb277bc811d85d.tar.gz android_external_libvpx-831d75e1120e538b6b56dbb71feb277bc811d85d.tar.bz2 android_external_libvpx-831d75e1120e538b6b56dbb71feb277bc811d85d.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/external/libvpx into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
-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 e50322b..651dc8f 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 |