Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Prevent a segfault occuring when quitting from warzone if a non-power of two number of tracks has been loaded into a playlist (due to uninitialized pointers) 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2711 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-11-04 16:05:11 +00:00
parent eeae9829cd
commit aa4bb6c529
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/sound/playlist.c
View File

@ -176,10 +176,17 @@ bool PlayList_Read(const char* path)
if (playlist[current_track].nb_songs == playlist[current_track].list_size)
{
char** songs;
playlist[current_track].list_size *= 2;
unsigned int new_list_size = playlist[current_track].list_size * 2;
unsigned int i;
// Make sure that we always allocate _some_ memory.
if (new_list_size == 0)
{
new_list_size = 1;
}
songs = (char**)realloc(playlist[current_track].songs,
playlist[current_track].list_size * sizeof(char*));
new_list_size * sizeof(char*));
if (songs == NULL)
{
debug(LOG_ERROR, "PlayList_Read: Out of memory!");
@ -189,7 +196,15 @@ bool PlayList_Read(const char* path)
return false;
}
// Initialize the new set of pointers to NULL. Since they don't point to
// allocated memory yet.
for (i = playlist[current_track].list_size; i < new_list_size; ++i)
{
songs[i] = NULL;
}
playlist[current_track].songs = songs;
playlist[current_track].list_size = new_list_size;
}
playlist[current_track].songs[playlist[current_track].nb_songs++] = filepath;