From f2b963627a5ea1f9dee25628a60f1b58150aeca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Mei=C3=9Fner?= Date: Fri, 31 Oct 2014 20:08:06 +0100 Subject: [PATCH] Do not crash when loading videos that exist but are not MKV --- Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp b/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp index 1f55eb69..4df8450c 100644 --- a/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp +++ b/Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp @@ -70,7 +70,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com { \ int64_t ret = 0; \ ret = x; \ - if (ret == -1) \ + if (ret < 0) \ { \ hsAssert(false, "failed to " err); \ return false; \ @@ -216,7 +216,7 @@ bool plMoviePlayer::IOpenMovie() // it contains everything you ever want to know about the movie long long pos = 0; mkvparser::EBMLHeader ebmlHeader; - ebmlHeader.Parse(fReader, pos); + SAFE_OP(ebmlHeader.Parse(fReader, pos), "read mkv header"); mkvparser::Segment* seg; SAFE_OP(mkvparser::Segment::CreateInstance(fReader, pos, seg), "get segment info"); SAFE_OP(seg->Load(), "load segment from webm");