Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(719)

Unified Diff: media/webm/webm_cluster_parser.cc

Issue 141013008: Report parse error for WebM clusters missing a timecode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/webm/webm_cluster_parser.cc
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
index 2a54ee232e0d7ea998997dfedd72c7ec6d682443..db76096187c28b304da7f15c17f61d384f732264 100644
--- a/media/webm/webm_cluster_parser.cc
+++ b/media/webm/webm_cluster_parser.cc
@@ -110,7 +110,11 @@ int WebMClusterParser::Parse(const uint8* buf, int size) {
// If there were no buffers in this cluster, set the cluster start time to
// be the |cluster_timecode_|.
if (cluster_start_time_ == kNoTimestamp()) {
- DCHECK_GT(cluster_timecode_, -1);
+ // If the cluster did not even have a |cluster_timecode_|, signal parse
+ // error.
+ if (cluster_timecode_ < 0)
+ return -1;
+
cluster_start_time_ = base::TimeDelta::FromMicroseconds(
cluster_timecode_ * timecode_multiplier_);
}
« no previous file with comments | « no previous file | media/webm/webm_cluster_parser_unittest.cc » ('j') | media/webm/webm_cluster_parser_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698