# HG changeset patch
# User Darkvater <darkvater@openttd.org>
# Date 2007-01-10 21:44:59
# Node ID 14e2ddedbdbe8611cdb7246805df1086a80fb41a
# Parent  903c7b1ef88c4926411038dd5e16435fc1de6326

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

diff --git a/src/heightmap.cpp b/src/heightmap.cpp
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -249,7 +249,7 @@ static bool ReadHeightmapBMP(char *filen
 			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
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1076,7 +1076,7 @@ static bool BridgeChangeInfo(uint brid, 
 
 				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++) {