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

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

Browse Source 
replace the common patterns assert(pos <= stop) / assert(pos == stop)
with error checks
+ harmonize error return -1 -> E_FILE_FORMAT_INVALID

BUG=23431751

Change-Id: Icfc582e414a7d02ae0675ef14c047922c4a12036
This commit is contained in:
James Zern 2015-08-24 19:56:45 -07:00
parent f1b2cfa03e
commit 2857b2350c
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mkvparser.cpp
View File

@ -3688,14 +3688,12 @@ long Tags::Parse() {
}
pos += size;
assert(pos <= stop);
if (pos > stop)
return -1;
return E_FILE_FORMAT_INVALID;
}
assert(pos == stop);
if (pos != stop)
return -1;
return E_FILE_FORMAT_INVALID;
return 0;
}
@ -3806,14 +3804,12 @@ long Tags::Tag::Parse(IMkvReader* pReader, long long pos, long long size) {
}
pos += size;
assert(pos <= stop);
if (pos > stop)
return -1;
return E_FILE_FORMAT_INVALID;
}
assert(pos == stop);
if (pos != stop)
return -1;
return E_FILE_FORMAT_INVALID;
return 0;
}
@ -3904,14 +3900,12 @@ long Tags::SimpleTag::Parse(IMkvReader* pReader, long long pos,
}
pos += size;
assert(pos <= stop);
if (pos > stop)
return -1;
return E_FILE_FORMAT_INVALID;
}
assert(pos == stop);
if (pos != stop)
return -1;
return E_FILE_FORMAT_INVALID;
return 0;
}
@ -5363,10 +5357,12 @@ long Tracks::Parse() {
}
pos = payload_stop;
assert(pos <= stop);
if (pos > stop)
return E_FILE_FORMAT_INVALID;
}
assert(pos == stop);
if (pos != stop)
return E_FILE_FORMAT_INVALID;
return 0; // success
}