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

(svn r8044) Regression (r8038): Crash on allocating bridge memory (peter1138)

release/0.6
Darkvater 2007-01-10 21:44:59 +00:00
parent c5a7eaca65
commit 0cb2bc2b23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/heightmap.cpp
View File

@ -249,7 +249,7 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
return false; return false;
} }
MallocT(map, info.width * info.height); MallocT(/* NO & */map, info.width * info.height);
if (*map == NULL) { if (*map == NULL) {
ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_BMPMAP_ERROR, 0, 0); ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_BMPMAP_ERROR, 0, 0);
fclose(f); fclose(f);

2
src/newgrf.cpp
View File

@ -1076,7 +1076,7 @@ static bool BridgeChangeInfo(uint brid, int numinfo, int prop, byte **bufp, int
if (bridge->sprite_table == NULL) { if (bridge->sprite_table == NULL) {
/* Allocate memory for sprite table pointers and zero out */ /* Allocate memory for sprite table pointers and zero out */
CallocT(bridge->sprite_table, 7); CallocT(&bridge->sprite_table, 7);
} }
for (; numtables-- != 0; tableid++) { for (; numtables-- != 0; tableid++) {