Prevent endless loop in place_random_engraving()

bhaak · bhaak · commit 968095ab07b2 · 2014-03-01T12:47:47.000Z
diff --git a/src/mklev.c b/src/mklev.c
@@ -1915,6 +1915,7 @@ const int size; /* number of engravings in array */
 	xchar sx, sy;
 	char const *engraving = engravings[rn2(size)];
 
+	int trycount=0;
 	do {
 		if (Inhell || nroom <= 1) {
 			/* random placement in Gehennom or levels with no rooms */
@@ -1932,9 +1933,11 @@ const int size; /* number of engravings in array */
 			    sy = somey(some_room);
 			}
 		}
-	} while (occupied(sx, sy));
+	} while (occupied(sx, sy) && (++trycount < 1000));
 
-	make_engr_at(sx, sy, engraving, 0L, BURN);
+	if (trycount < 1000) {
+		make_engr_at(sx, sy, engraving, 0L, BURN);
+	}
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1915,6 +1915,7 @@ const int size; /* number of engravings in array */`
`1915`	`1915`	`xchar sx, sy;`
`1916`	`1916`	`char const *engraving = engravings[rn2(size)];`
`1917`	`1917`
	`1918`	`+ int trycount=0;`
`1918`	`1919`	`do {`
`1919`	`1920`	`if (Inhell \|\| nroom <= 1) {`
`1920`	`1921`	`/* random placement in Gehennom or levels with no rooms */`
`@@ -1932,9 +1933,11 @@ const int size; /* number of engravings in array */`
`1932`	`1933`	`sy = somey(some_room);`
`1933`	`1934`	`}`
`1934`	`1935`	`}`
`1935`		`- } while (occupied(sx, sy));`
	`1936`	`+ } while (occupied(sx, sy) && (++trycount < 1000));`
`1936`	`1937`
`1937`		`- make_engr_at(sx, sy, engraving, 0L, BURN);`
	`1938`	`+ if (trycount < 1000) {`
	`1939`	`+ make_engr_at(sx, sy, engraving, 0L, BURN);`
	`1940`	`+ }`
`1938`	`1941`	`}`
`1939`	`1942`
`1940`	`1943`	`/*`