From 1fcbfd85c9f00a59980fb00927a26fb854c69117 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Sat, 13 May 2006 20:19:06 +0000
Subject: [PATCH] additonal oextra care

Be deliberately careful with copies taken of
oextra pointers and clear the pointer if it
truly is a redundant copy that will become
invalid if/when the original holder is deallocated.
---
 src/apply.c    |  5 ++++-
 src/artifact.c |  2 +-
 src/detect.c   | 11 +++++++----
 src/display.c  |  1 +
 src/music.c    |  4 ++++
 src/trap.c     |  3 ++-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/apply.c b/src/apply.c
index 7a5c8d323..cb3b7314a 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)apply.c	3.5	2005/12/05	*/
+/*	SCCS Id: @(#)apply.c	3.5	2006/05/13 	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1997,6 +1997,9 @@ struct obj *tstone;
     if (obj->oclass == COIN_CLASS) {
 	u.ugold += obj->quan;	/* keep botl up to date */
 	goldobj = *obj;
+	goldobj.oextra = (struct oextra *)0; /* dealloc_obj(obj) will invalidate
+					        the target of this copied ptr
+						here, so clear it out */
 	dealloc_obj(obj);
 	obj = &goldobj;
     }
diff --git a/src/artifact.c b/src/artifact.c
index 3b5ea3be7..44496631e 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -1233,7 +1233,7 @@ arti_invoke(obj)
 	case TAMING: {
 	    struct obj pseudo;
 
-	    pseudo = zeroobj;	/* neither cursed nor blessed */
+	    pseudo = zeroobj;	/* neither cursed nor blessed, zero oextra too */
 	    pseudo.otyp = SCR_TAMING;
 	    (void) seffects(&pseudo);
 	    break;
diff --git a/src/detect.c b/src/detect.c
index fb5c65932..efda3fe48 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)detect.c	3.5	2005/11/09	*/
+/*	SCCS Id: @(#)detect.c	3.5	2006/05/13	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -259,7 +259,7 @@ outgoldmap:
 	if (findgold(mtmp->minvent) || monsndx(mtmp->data) == PM_GOLD_GOLEM) {
 #endif
 	    struct obj gold;
-
+	    gold = zeroobj;		/* ensure oextra is cleared too */
 	    gold.otyp = GOLD_PIECE;
 	    gold.ox = mtmp->mx;
 	    gold.oy = mtmp->my;
@@ -540,6 +540,7 @@ int		class;		/* an object class, 0 for all */
 		(!class || class == objects[mtmp->mappearance].oc_class)) {
 	    struct obj temp;
 
+	    temp.oextra = (struct oextra *)0;
 	    temp.otyp = mtmp->mappearance;	/* needed for obj_to_glyph() */
 	    temp.ox = mtmp->mx;
 	    temp.oy = mtmp->my;
@@ -551,7 +552,7 @@ int		class;		/* an object class, 0 for all */
 	} else if (findgold(mtmp->minvent) && (!class || class == COIN_CLASS)) {
 #endif
 	    struct obj gold;
-
+	    gold = zeroobj;		/* ensure oextra is cleared too */
 	    gold.otyp = GOLD_PIECE;
 	    gold.ox = mtmp->mx;
 	    gold.oy = mtmp->my;
@@ -649,7 +650,9 @@ xchar x, y;
 int src_cursed;
 {
     if (Hallucination || src_cursed) {
-	struct obj obj;			/* fake object */
+	struct obj obj;		/* fake object */
+
+	obj.oextra = (struct oextra *)0;
 	if (trap) {
 	    obj.ox = trap->tx;
 	    obj.oy = trap->ty;
diff --git a/src/display.c b/src/display.c
index 4dd5fafc8..b9c7cf0e0 100644
--- a/src/display.c
+++ b/src/display.c
@@ -403,6 +403,7 @@ display_monster(x, y, mon, sightflags, worm_tail)
 	    case M_AP_OBJECT: {
 		struct obj obj;	/* Make a fake object to send	*/
 				/* to map_object().		*/
+		obj.oextra = (struct oextra *)0;
 		obj.ox = x;
 		obj.oy = y;
 		obj.otyp = mon->mappearance;
diff --git a/src/music.c b/src/music.c
index 8ce9a7dbb..6e0124acc 100644
--- a/src/music.c
+++ b/src/music.c
@@ -403,6 +403,10 @@ struct obj *instr;
 	struct obj itmp;
 
 	itmp = *instr;
+	itmp.oextra = (struct oextra *)0;  /* ok on this copy as instr maintains
+					      the ptr to free at some point if
+					      there is one */
+
 	/* if won't yield special effect, make sound of mundane counterpart */
 	if (!do_spec || instr->spe <= 0)
 	    while (objects[itmp.otyp].oc_magic) itmp.otyp -= 1;
diff --git a/src/trap.c b/src/trap.c
index f567f4cf1..ba05e90bc 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -2748,7 +2748,8 @@ domagictrap()
 		   {	struct obj pseudo;
 			long save_conf = HConfusion;
 
-			pseudo = zeroobj;   /* neither cursed nor blessed */
+			pseudo = zeroobj;   /* neither cursed nor blessed,
+						and zero out oextra */
 			pseudo.otyp = SCR_REMOVE_CURSE;
 			HConfusion = 0L;
 			(void) seffects(&pseudo);
-- 
2.40.0