mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14527) -Fix: allocate stub (empty) sound entries when loading an empty/corrupt/incorrectly sized sample.cat instead of making valid NewGRFs fail to load.

release/0.7
rubidium 2008-10-25 10:26:23 +00:00
parent 7588513003
commit 9075a2bbfc
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/sound.cpp
View File

@ -23,43 +23,37 @@ MusicFileSettings msf;
// Number of levels of panning per side // Number of levels of panning per side
#define PANNING_LEVELS 16 #define PANNING_LEVELS 16
/** The number of sounds in the original sample.cat */
static const uint ORIGINAL_SAMPLE_COUNT = 73;
static void OpenBankFile(const char *filename) static void OpenBankFile(const char *filename)
{ {
uint i; FileEntry *fe = CallocT<FileEntry>(ORIGINAL_SAMPLE_COUNT);
_file_count = ORIGINAL_SAMPLE_COUNT;
_files = fe;
FioOpenFile(SOUND_SLOT, filename); FioOpenFile(SOUND_SLOT, filename);
size_t pos = FioGetPos(); size_t pos = FioGetPos();
uint count = FioReadDword() / 8; uint count = FioReadDword() / 8;
/* Simple check for the correct number of original sounds. */ /* Simple check for the correct number of original sounds. */
if (count != 73) { if (count != ORIGINAL_SAMPLE_COUNT) {
/* Corrupt sample data? Just leave the allocated memory as those tell
* there is no sound to play (size = 0 due to calloc). Not allocating
* the memory disables valid NewGRFs that replace sounds. */
DEBUG(misc, 6, "Incorrect number of sounds in '%s', ignoring.", filename); DEBUG(misc, 6, "Incorrect number of sounds in '%s', ignoring.", filename);
_file_count = 0;
_files = NULL;
return; return;
} }
FileEntry *fe = CallocT<FileEntry>(count);
if (fe == NULL) {
_file_count = 0;
_files = NULL;
return;
}
_file_count = count;
_files = fe;
FioSeekTo(pos, SEEK_SET); FioSeekTo(pos, SEEK_SET);
for (i = 0; i != count; i++) { for (uint i = 0; i != ORIGINAL_SAMPLE_COUNT; i++) {
fe[i].file_slot = SOUND_SLOT; fe[i].file_slot = SOUND_SLOT;
fe[i].file_offset = FioReadDword() + pos; fe[i].file_offset = FioReadDword() + pos;
fe[i].file_size = FioReadDword(); fe[i].file_size = FioReadDword();
} }
for (i = 0; i != count; i++, fe++) { for (uint i = 0; i != ORIGINAL_SAMPLE_COUNT; i++, fe++) {
char name[255]; char name[255];
FioSeekTo(fe->file_offset, SEEK_SET); FioSeekTo(fe->file_offset, SEEK_SET);