TITANIC: Fix Coverity reported warnings

scummvm · Feb 14, 2017 · 3a41bed · 3a41bed
1 parent 534ec94
commit 3a41bed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/engines/titanic/sound/audio_buffer.cpp b/engines/titanic/sound/audio_buffer.cpp
@@ -27,6 +27,7 @@ namespace Titanic {
 
 CAudioBuffer::CAudioBuffer(int maxSize) : _finished(false) {
 	_data.resize(maxSize);
+	reset();
 }
 
 void CAudioBuffer::reset() {

diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
@@ -171,7 +171,8 @@ void CWaveFile::load(byte *data, uint dataSize) {
 
 	// Parse the wave header
 	Common::MemoryReadStream wavStream(data, dataSize, DisposeAfterUse::NO);
-	Audio::loadWAVFromStream(wavStream, _dataSize, _rate, _flags, &_wavType);
+	if (!Audio::loadWAVFromStream(wavStream, _dataSize, _rate, _flags, &_wavType))
+		error("Invalid wave file");
 	_headerSize = wavStream.pos();
 }