From d099b00b53903395f6c98bbf7938663818f13325 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Wed, 12 Nov 2008 07:36:19 +0000
Subject: [PATCH] leave at least a working tree, with zero-penalty
 -DAALLOC_NO_COOKIES XXX cookies are still broken?

cost for aalloc.c: data -= (4, 0, 4, 0); text += (1665, ?, 2115, 2217)
---
 Build.sh |  4 ++--
 Makefile |  3 ++-
 aalloc.c | 62 ++++++++++++++++++++++++++++++++------------------------
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/Build.sh b/Build.sh
index 15994e9..5d2059d 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.371 2008/11/11 23:20:08 tg Exp $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.372 2008/11/12 07:36:18 tg Exp $'
 #-
 # Environment used: CC CFLAGS CPPFLAGS LDFLAGS LIBS NOWARN NROFF TARGET_OS
 # CPPFLAGS recognised:	MKSH_SMALL MKSH_ASSUME_UTF8 MKSH_NOPWNAM MKSH_NOVI
@@ -251,7 +251,7 @@ do
 	esac
 done
 
-SRCS="alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c"
+SRCS="aalloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c"
 SRCS="$SRCS jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c"
 
 if test x"$srcdir" = x"."; then
diff --git a/Makefile b/Makefile
index 271fad8..9daa3d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/Makefile,v 1.66 2008/11/12 04:59:42 tg Exp $
+# $MirOS: src/bin/mksh/Makefile,v 1.67 2008/11/12 07:36:18 tg Exp $
 #-
 # use CPPFLAGS=-DDEBUG __CRAZY=Yes to check for certain more stuff
 
@@ -11,6 +11,7 @@ SRCS=		aalloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c \
 .  if ${DEBUGLIBS:L} == "yes"
 CPPFLAGS+=	-DMKSH_AFREE_DEBUG	# MirOS development version
 .  endif
+CPPFLAGS+=	-DAALLOC_NO_COOKIES	# for now… aalloc cookies are broken
 CPPFLAGS+=	-DMKSH_ASSUME_UTF8 \
 		-DHAVE_ATTRIBUTE=1 -DHAVE_ATTRIBUTE_BOUNDED=1 \
 		-DHAVE_ATTRIBUTE_USED=1 -DHAVE_SYS_PARAM_H=1 \
diff --git a/aalloc.c b/aalloc.c
index e5faf5b..f5d2d54 100644
--- a/aalloc.c
+++ b/aalloc.c
@@ -1,6 +1,6 @@
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.22 2008/11/12 07:02:47 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/aalloc.c,v 1.23 2008/11/12 07:36:19 tg Exp $");
 
 /* mksh integration of aalloc */
 
@@ -68,9 +68,11 @@ struct TArea {
 #endif
 };
 
-static TCookie gcookie;
+static TCookie global_cookie;
 #ifdef AALLOC_NO_COOKIES
-static TCookie fake_cookie;
+#define gcookie 0
+#else
+#define gcookie global_cookie
 #endif
 
 #ifdef AALLOC_TRACK
@@ -154,17 +156,14 @@ anew(void)
 		    (unsigned long)sizeof (struct TBlock));
 #endif
 
-#ifdef AALLOC_NO_COOKIES
-#define gcookie fake_cookie
-#endif
-	if (!gcookie) {
+	if (!global_cookie) {
 		size_t v;
 
 		/* ensure unaligned cookie */
 		do {
-			gcookie = AALLOC_RANDOM();
+			global_cookie = AALLOC_RANDOM();
 			v = AALLOC_RANDOM() & 7;
-		} while (!(gcookie & PVMASK) || !v);
+		} while (!(global_cookie & PVMASK) || !v);
 		/* randomise seed afterwards */
 		while (v--)
 			AALLOC_RANDOM();
@@ -172,7 +171,6 @@ anew(void)
 		atexit(track_check);
 #endif
 	}
-#undef gcookie
 
 	ap = NULL; safe_realloc(ap, sizeof (struct TArea));
 	bp = NULL; safe_realloc(bp, AALLOC_INITSZ);
@@ -255,35 +253,40 @@ check_bp(PArea ap, const char *funcname, TCookie ocookie)
 static void
 track_check(void)
 {
-	PArea ap;
+	PArea tp;
+	TPtr lp;
 	PBlock bp;
 
 	while (track) {
-		ap = track;
-		ap->ocookie ^= gcookie;
-		ap->prev.iv ^= gcookie;
-		if ((ap->prev.iv & PVMASK) || (ap->ocookie & PVMASK)) {
+		tp = track;
+		tp->ocookie ^= gcookie;
+		lp.iv = tp->prev.iv ^ gcookie;
+		if ((lp.iv & PVMASK)
+#ifndef AALLOC_NO_COOKIES
+		    || !(tp->ocookie & PVMASK)
+#endif
+		    ) {
 			/* buffer overflow or something? */
 			AALLOC_WARN("AALLOC_TRACK data structure %p destroyed:"
-			    " %p, %p, %p; exiting", ap, ap->prev.pv,
-			    ap->bp.pv, (void *)ap->ocookie);
+			    " %p, %p, %p; exiting", tp, lp.pv, tp->bp.pv,
+			    (void *)tp->ocookie);
 			return;
 		}
-		if (!(bp = check_bp(ap, "atexit:track_check", ap->ocookie)))
+		if (!(bp = check_bp(tp, "atexit:track_check", tp->ocookie)))
 			goto track_next;
 		if (bp->last != (char *)&bp->storage)
 #ifdef MKSH_VERSION	/* allowed to leak silently */
-			adelete_leak(ap, bp, false, "at exit");
+			adelete_leak(tp, bp, false, "at exit");
 #else
-			adelete_leak(ap, bp, true, "at exit");
+			adelete_leak(tp, bp, true, "at exit");
 		else
-			AALLOC_WARN("leaking empty area %p (%p %lu)", ap,
+			AALLOC_WARN("leaking empty area %p (%p %lu)", tp,
 			    bp, (unsigned long)(bp->endp - (char *)bp));
 #endif
 		free(bp);
  track_next:
-		track = (PArea)ap->prev.pv;
-		free(ap);
+		track = (PArea)lp.pv;
+		free(tp);
 	}
 }
 #endif
@@ -311,6 +314,7 @@ adelete(PArea *pap)
 {
 #ifdef AALLOC_TRACK
 	PArea tp;
+	TPtr lp;
 #endif
 	PBlock bp;
 
@@ -330,12 +334,16 @@ adelete(PArea *pap)
 	/* find the TArea whose prev is *pap */
 	tp = track;
 	while (tp) {
-		TPtr lp;
 		lp.iv = tp->prev.iv ^ gcookie;
-		if ((lp.iv & PVMASK) || (tp->ocookie & PVMASK)) {
+		if ((lp.iv & PVMASK)
+#ifndef AALLOC_NO_COOKIES
+		    || !((tp->ocookie ^ gcookie) & PVMASK)
+#endif
+		    ) {
+			/* buffer overflow or something? */
 			AALLOC_WARN("AALLOC_TRACK data structure %p destroyed:"
-			    " %p, %p, %p", tp, tp->prev.pv, tp->bp.pv,
-			    (void *)tp->ocookie);
+			    " %p, %p, %p; exiting", tp, lp.pv, tp->bp.pv,
+			    (void *)(tp->ocookie ^ gcookie));
 			tp = NULL;
 			break;
 		}