From 26e74eba24ce660090a0d352eb90b67433cf8240 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Wed, 7 Aug 2002 02:38:04 +0000
Subject: [PATCH] stone to flesh crash Problem was due to the use of obj in the
 caller (bhito), after delete of the obj within animate_statue().

map_object(obj * 0x0000ff00, int 1) line 254 + 3 bytes
newsym(int -18, int -2) line 702 + 102 bytes
bhito(obj * 0x002f6c00, obj * 0x002f7398) line 1665 + 21 bytes
bhitpile(obj * 0x002f7398, int (obj *, obj *)* 0x0055220b bhito(obj *, obj *), int 37, int 11) line 1701 + 11 bytes
bhit(int 0, int 1, int 10, int 0, int (monst *, obj *)* 0x0054e0e0 bhitm(monst *, obj *), int (obj *, obj *)* 0x0055220b bhito(obj *, obj *), obj * 0x002f7398) line 2707 + 29 bytes
weffects(obj * 0x002f7398) line 2434 + 51 bytes
spelleffects(int 3, char 0) line 824 + 11 bytes
docast() line 552 + 11 bytes
rhack(char * 0x005b6034 in_line) line 1813 + 3 bytes
moveloop() line 405 + 7 bytes
main(int 3, char * * 0x002f2b10) line 93
---
 src/zap.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/zap.c b/src/zap.c
index f789d1d4c..f1f64ebcf 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -1426,6 +1426,7 @@ bhito(obj, otmp)
 struct obj *obj, *otmp;
 {
 	int res = 1;	/* affected object by default */
+	xchar refresh_x, refresh_y;
 
 	if (obj->bypass) {
 		/* The bypass bit is currently only used as follows:
@@ -1581,6 +1582,7 @@ struct obj *obj, *otmp;
 		res = 0;
 		break;
 	case SPE_STONE_TO_FLESH:
+		refresh_x = obj->ox; refresh_y = obj->oy;
 		if (objects[obj->otyp].oc_material != MINERAL &&
 			objects[obj->otyp].oc_material != GEMSTONE) {
 		    res = 0;
@@ -1598,6 +1600,7 @@ struct obj *obj, *otmp;
 			    xchar oox, ooy;
 
 			    (void) get_obj_location(obj, &oox, &ooy, 0);
+			    refresh_x = oox; refresh_y = ooy;
 			    if (!animate_statue(obj, oox, ooy,
 						ANIMATE_SPELL, (int *)0)) {
 				struct obj *item;
@@ -1612,7 +1615,7 @@ makecorpse:			if (mons[obj->corpsenm].geno &
 				 */
 				while ((item = obj->cobj) != 0) {
 				    obj_extract_self(item);
-				    place_object(item, obj->ox, obj->oy);
+				    place_object(item, oox, ooy);
 				}
 				obj = poly_obj(obj, CORPSE);
 				break;
@@ -1632,6 +1635,7 @@ makecorpse:			if (mons[obj->corpsenm].geno &
 			    break;
 			}
 			(void) get_obj_location(obj, &oox, &ooy, 0);
+			refresh_x = oox; refresh_y = ooy;
 			mon = makemon(&mons[obj->corpsenm],
 				      oox, ooy, NO_MM_FLAGS);
 			if (mon) {
@@ -1662,7 +1666,7 @@ smell:
 			res = 0;
 			break;
 		}
-		newsym(obj->ox,obj->oy);
+		newsym(refresh_x, refresh_y);
 		break;
 	default:
 		impossible("What an interesting effect (%d)", otmp->otyp);