diff options
| author | Darkvater <darkvater@openttd.org> | 2007-01-10 21:44:59 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2007-01-10 21:44:59 +0000 |
| commit | 0cb2bc2b23840d08a4985177b650ab58c929ec1f (patch) | |
| tree | 1bb85f4e0bb60940c7ebee4294db311bf28483de | |
| parent | c5a7eaca6585befc5b30e8974dcf8d2a281820e5 (diff) | |
| download | openttd-0cb2bc2b23840d08a4985177b650ab58c929ec1f.tar.xz | |
(svn r8044) Regression (r8038): Crash on allocating bridge memory (peter1138)
| -rw-r--r-- | src/heightmap.cpp | 2 | ||||
| -rw-r--r-- | src/newgrf.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/heightmap.cpp b/src/heightmap.cpp index 57f4c30b1..85e5d34a3 100644 --- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -249,7 +249,7 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map) return false; } - MallocT(map, info.width * info.height); + MallocT(/* NO & */map, info.width * info.height); if (*map == NULL) { ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_BMPMAP_ERROR, 0, 0); fclose(f); diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 13fb45cdc..988698762 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -1076,7 +1076,7 @@ static bool BridgeChangeInfo(uint brid, int numinfo, int prop, byte **bufp, int if (bridge->sprite_table == NULL) { /* Allocate memory for sprite table pointers and zero out */ - CallocT(bridge->sprite_table, 7); + CallocT(&bridge->sprite_table, 7); } for (; numtables-- != 0; tableid++) { |