generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chapters::*::Parse: replace pos asserts w/checks

Browse Source 
replace the common patterns assert(pos <= stop) / assert(pos == stop)
with error checks

BUG=23431751

Change-Id: I3425f6083456b5ab4f40497e3a192569b494dfa9
This commit is contained in:
James Zern
2015-08-24 19:54:08 -07:00
parent ca8062959a
commit f1b2cfa03e
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mkvparser.cpp
View File

@@ -3223,10 +3223,12 @@ long Chapters::Parse() {
} }
pos += size; pos += size;
assert(pos <= stop); if (pos > stop)
return E_FILE_FORMAT_INVALID;
} }
assert(pos == stop); if (pos != stop)
return E_FILE_FORMAT_INVALID;
return 0; return 0;
} }
@@ -3337,10 +3339,12 @@ long Chapters::Edition::Parse(IMkvReader* pReader, long long pos,
} }
pos += size; pos += size;
assert(pos <= stop); if (pos > stop)
return E_FILE_FORMAT_INVALID;
} }
assert(pos == stop); if (pos != stop)
return E_FILE_FORMAT_INVALID;
return 0; return 0;
} }
@@ -3495,10 +3499,12 @@ long Chapters::Atom::Parse(IMkvReader* pReader, long long pos, long long size) {
} }
pos += size; pos += size;
assert(pos <= stop); if (pos > stop)
return E_FILE_FORMAT_INVALID;
} }
assert(pos == stop); if (pos != stop)
return E_FILE_FORMAT_INVALID;
return 0; return 0;
} }
@@ -3629,10 +3635,12 @@ long Chapters::Display::Parse(IMkvReader* pReader, long long pos,
} }
pos += size; pos += size;
assert(pos <= stop); if (pos > stop)
return E_FILE_FORMAT_INVALID;
} }
assert(pos == stop); if (pos != stop)
return E_FILE_FORMAT_INVALID;
return 0; return 0;
} }