From f36710f8b4e5d28517fdcb35ac4fefbd15734be7 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 3 Feb 2004 08:53:13 +0000 Subject: Act more gracefully when failing to load a (VOC) sound (should help bug #889442) svn-id: r12719 --- sound/voc.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sound') diff --git a/sound/voc.cpp b/sound/voc.cpp index 80027fb143..ef1741111f 100644 --- a/sound/voc.cpp +++ b/sound/voc.cpp @@ -156,6 +156,9 @@ AudioStream *makeVOCStream(byte *ptr) { int size, rate, loops; byte *data = readVOCFromMemory(ptr, size, rate, loops); + if (!data) + return 0; + return makeLinearInputStream(rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, data, size, 0, 0); } @@ -163,6 +166,9 @@ AudioStream *makeVOCStream(File *file) { int size, rate; byte *data = loadVOCFile(file, size, rate); + if (!data) + return 0; + return makeLinearInputStream(rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, data, size, 0, 0); } -- cgit v1.2.3