From f98562ebe038f54dc988598463b9432eff197b83 Mon Sep 17 00:00:00 2001 From: TheApadayo Date: Mon, 13 Feb 2017 11:24:07 -0500 Subject: [PATCH] [ILoadedSound] small fixes --- src/Components/Modules/AssetInterfaces/ILoadedSound.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/Modules/AssetInterfaces/ILoadedSound.cpp b/src/Components/Modules/AssetInterfaces/ILoadedSound.cpp index 7788ec4f..dc239c01 100644 --- a/src/Components/Modules/AssetInterfaces/ILoadedSound.cpp +++ b/src/Components/Modules/AssetInterfaces/ILoadedSound.cpp @@ -29,6 +29,7 @@ namespace Assets if (chunkIDBuffer != 0x46464952) // RIFF { Components::Logger::Error(0, "Reading sound '%s' failed, header is invalid!", name.data()); + return; } unsigned int chunkSize = reader.read(); @@ -37,6 +38,7 @@ namespace Assets if (format != 0x45564157) // WAVE { Components::Logger::Error(0, "Reading sound '%s' failed, header is invalid!", name.data()); + return; } while (!sound->sound.data && !reader.end()) @@ -53,6 +55,7 @@ namespace Assets if (sound->sound.info.format != 1 && sound->sound.info.format != 17) { Components::Logger::Error(0, "Reading sound '%s' failed, invalid format!", name.data()); + return; } sound->sound.info.channels = reader.read(); @@ -86,9 +89,10 @@ namespace Assets if (!sound->sound.info.data_ptr) { Components::Logger::Error(0, "Reading sound '%s' failed, invalid format!", name.data()); + return; } - sound->name = _strdup(name.c_str()); + sound->name = builder->getAllocator()->duplicateString(name.c_str()); header->loadSnd = sound; }