summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2015-03-05 16:03:48 -0800
committerVignesh Venkatasubramanian <vigneshv@google.com>2015-03-05 16:03:48 -0800
commitfc1f97bc051863f9c2ec41d749ce5b4513b9f0fc (patch)
treeed0f024fabcb40f31716cdea7cde86efd9311282
parent47ec6d9ed7e85e6580ef5db0313ca0886e0d132b (diff)
downloadandroid_external_libvpx-fc1f97bc051863f9c2ec41d749ce5b4513b9f0fc.tar.gz
android_external_libvpx-fc1f97bc051863f9c2ec41d749ce5b4513b9f0fc.tar.bz2
android_external_libvpx-fc1f97bc051863f9c2ec41d749ce5b4513b9f0fc.zip
libwebm: Fix parser if UID high bit is set
Cherry-picking change from https://gerrit.chromium.org/gerrit/#/c/73959/ Change-Id: I8d98543f226594b28a88d5042f43c76f1224c0bb
-rw-r--r--libwebm/mkvparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp
index f7a34c1..7501b9f 100644
--- a/libwebm/mkvparser.cpp
+++ b/libwebm/mkvparser.cpp
@@ -4133,7 +4133,7 @@ long Chapters::Atom::Parse(IMkvReader* pReader, long long pos, long long size) {
long long val;
status = UnserializeInt(pReader, pos, size, val);
- if (val < 0) // error
+ if (status < 0) // error
return status;
m_uid = static_cast<unsigned long long>(val);