summaryrefslogtreecommitdiffstats
path: root/libwebm
diff options
context:
space:
mode:
authorAmarghosh Vadakkoot <amarghosh@google.com>2013-07-26 14:24:16 +0900
committerSungsoo Lim <sungsoo@google.com>2013-08-05 09:41:50 +0900
commita8b927ab4f06e2fc0d16d9606b57672df9899ac1 (patch)
treed3da6f3ee6057f0f587bbb74d4a426bbc4f4661f /libwebm
parent91037db265ecdd914a26e056cf69207b4f50924e (diff)
downloadandroid_external_libvpx-a8b927ab4f06e2fc0d16d9606b57672df9899ac1.tar.gz
android_external_libvpx-a8b927ab4f06e2fc0d16d9606b57672df9899ac1.tar.bz2
android_external_libvpx-a8b927ab4f06e2fc0d16d9606b57672df9899ac1.zip
Handle zero lengthed track entries in mkv files
Bug: 9150326 Change-Id: I7ca1e10269e37a7d5691fd5b44eae74bc3680b95
Diffstat (limited to 'libwebm')
-rw-r--r--libwebm/mkvparser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp
index e48343f..894d470 100644
--- a/libwebm/mkvparser.cpp
+++ b/libwebm/mkvparser.cpp
@@ -5760,7 +5760,7 @@ long Tracks::ParseTrackEntry(
if (id == 0x60) // VideoSettings ID
{
- if (size <= 0)
+ if (size < 0)
return E_FILE_FORMAT_INVALID;
v.start = start;
@@ -5768,7 +5768,7 @@ long Tracks::ParseTrackEntry(
}
else if (id == 0x61) // AudioSettings ID
{
- if (size <= 0)
+ if (size < 0)
return E_FILE_FORMAT_INVALID;
a.start = start;
@@ -5776,7 +5776,7 @@ long Tracks::ParseTrackEntry(
}
else if (id == 0x2D80) // ContentEncodings ID
{
- if (size <= 0)
+ if (size < 0)
return E_FILE_FORMAT_INVALID;
e.start = start;