TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix a critical bug in string_array_add - when d_reallocing the buffer containing the string data, update all the pointers in '*list' as well as next_str, preventing ugly crashes

Browse source
This commit is contained in:
Chris Taylor 2011-02-21 14:36:18 +08:00
parent 4c58b43b2d
commit 32187e428f
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20110221
--------
misc/strutil.c: Fix a critical bug in string_array_add - when d_reallocing the buffer containing the string data, update all the pointers in '*list' as well as next_str, preventing ugly crashes
20110218
--------
arch/ogl/ogl.c, include/ogl_init.h, main/endlevel.c, main/object.c: Draw laser effects with special blending instead of disabled DepthMask; Added special blending for transparency effects as well to let them kick more ass; Corrections while rendering outside part of endlevel sequence with disabled depth testing and dynamically changing Render_depth to make the mine exit visible again while not rendering the exit tunnel tru the planet terrain

16
misc/strutil.c
View file

@ -260,11 +260,20 @@ int string_array_add(char ***list, char **list_buf, int *num_str, int *max_str,
if (next_str + strlen(str) + 1 - *list_buf >= *max_buf)
{
char *new_buf = d_realloc(*list_buf, *max_buf*sizeof(char)*MEM_K);
int i;
char *new_buf;
new_buf = d_realloc(*list_buf, *max_buf*sizeof(char)*MEM_K);
if (new_buf == NULL)
return 0;
// Update all the pointers in the pointer list
for (i = 0; i < *num_str; i++)
(*list)[i] += (new_buf - *list_buf);
*max_buf *= MEM_K;
*list_buf = new_buf;
next_str = *num_str ? (*list)[*num_str - 1] + strlen((*list)[*num_str - 1]) + 1 : *list_buf;
}
strcpy(next_str, str);
@ -291,13 +300,14 @@ void string_array_tidy(char ***list, char **list_buf, int *num_str, int *max_str
*max_str = *num_str;
}
temp_buf = d_realloc(*list_buf, (j = *num_str ? (*list)[*num_str - 1] + strlen((*list)[*num_str - 1]) + 1 - *list_buf : 1));
j = *num_str ? (*list)[*num_str - 1] + strlen((*list)[*num_str - 1]) + 1 - *list_buf : 1; // buffer size - a bit of variable recycling
temp_buf = d_realloc(*list_buf, j);
if (temp_buf)
{
for (i = 0; i < *num_str; i++)
(*list)[i] += (temp_buf - *list_buf);
*list_buf = temp_buf;
*max_buf = j; // set to buffer size used - a bit of variable recycling here
*max_buf = j; // set to buffer size used
}
// Sort by name, starting at offset