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

mkvparser/ContentEncoding: convert asserts to failure returns

Browse Source 
Change-Id: I06efadb5242135b095ad4cdefceef0e1c42c79b9
This commit is contained in:
James Zern 2015-08-21 19:48:54 -07:00
parent b0e4f32011
commit 5135c4cd74
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mkvparser.cpp
View File

@ -4107,7 +4107,8 @@ long ContentEncoding::ParseContentEncAESSettingsEntry(
}
pos += size; // consume payload
assert(pos <= stop);
if (pos > stop)
return E_FILE_FORMAT_INVALID;
}
return 0;
@ -4137,7 +4138,8 @@ long ContentEncoding::ParseContentEncodingEntry(long long start, long long size,
++encryption_count;
pos += size; // consume payload
assert(pos <= stop);
if (pos > stop)
return E_FILE_FORMAT_INVALID;
}
if (compression_count <= 0 && encryption_count <= 0)
@ -4208,10 +4210,12 @@ long ContentEncoding::ParseContentEncodingEntry(long long start, long long size,
}
pos += size; // consume payload
assert(pos <= stop);
if (pos > stop)
return E_FILE_FORMAT_INVALID;
}
assert(pos == stop);
if (pos != stop)
return E_FILE_FORMAT_INVALID;
return 0;
}
@ -4262,7 +4266,8 @@ long ContentEncoding::ParseCompressionEntry(long long start, long long size,
}
pos += size; // consume payload
assert(pos <= stop);
if (pos > stop)
return E_FILE_FORMAT_INVALID;
}
// ContentCompAlgo is mandatory
@ -4379,7 +4384,8 @@ long ContentEncoding::ParseEncryptionEntry(long long start, long long size,
}
pos += size; // consume payload
assert(pos <= stop);
if (pos > stop)
return E_FILE_FORMAT_INVALID;
}
return 0;