From bb7ec163ba0fc04d91f24a130c0330ca61eac53a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sat, 31 Dec 2005 16:06:32 +0000
Subject: [PATCH] fix buffer allocation

svn: r1733
---
 src/mred/mredmac.cxx       |  2 +-
 src/mred/wxme/wx_medio.cxx | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/mred/mredmac.cxx b/src/mred/mredmac.cxx
index 33fb3c8993..8f68486e1f 100644
--- a/src/mred/mredmac.cxx
+++ b/src/mred/mredmac.cxx
@@ -291,7 +291,7 @@ int WNE(EventRecord *e, double sleep_secs)
 
     if (!ok) {
       if ((GetEventClass(ref) == kEventClassMouse)
-		 && (GetEventKind(ref) == kEventMouseWheelMoved)) {
+	  && (GetEventKind(ref) == kEventMouseWheelMoved)) {
 	UInt32 modifiers;
 	EventMouseWheelAxis axis;
 	SInt32 delta;
diff --git a/src/mred/wxme/wx_medio.cxx b/src/mred/wxme/wx_medio.cxx
index 64758fd23b..214153c7c6 100644
--- a/src/mred/wxme/wx_medio.cxx
+++ b/src/mred/wxme/wx_medio.cxx
@@ -592,7 +592,9 @@ char *wxMediaStreamIn::GetAString(long *n, long limit, char *target, int extra,
 	while (1) {
 	  if ((size + get_amt + 1) >= alloc) {
 	    char *naya;
-	    alloc *= 2;
+	    do {
+	      alloc *= 2;
+	    } while (alloc <= (size + get_amt + 1));
 	    naya = new WXGC_ATOMIC char[alloc];
 	    memcpy(naya, s, size);
 	    s = naya;
@@ -663,13 +665,17 @@ char *wxMediaStreamIn::GetAString(long *n, long limit, char *target, int extra,
 		  return SCHEME_BYTE_STR_VAL(str);
 		}
 	      } else {
-		printf("bad 9.9 %ld %ld %s\n", orig_len, len, SCHEME_BYTE_STR_VAL(str));
+		BAD_PRINTF(("bad 9.9 %ld %ld %s\n", orig_len, len, SCHEME_BYTE_STR_VAL(str)));
 	      }
 	    }
 	  }
+	  BAD_PRINTF(("bad 10--1\n"));
 	}
+	BAD_PRINTF(("bad 10-0\n"));
       }
+      BAD_PRINTF(("bad 10-1\n"));
     }
+    BAD_PRINTF(("bad 10-2\n"));
   } else if (!recur && (buf[0] == '(')) {
     /* Read a sequence of strings */
     Scheme_Object *accum = scheme_null;
@@ -749,6 +755,9 @@ char *wxMediaStreamIn::GetAString(long *n, long limit, char *target, int extra,
 
       return target;
     }
+    BAD_PRINTF(("bad 10-3\n"));
+  } else {
+    BAD_PRINTF(("bad 10-4 %d\n", buf[0]));
   }
    
   bad = 1;
@@ -997,7 +1006,7 @@ wxMediaStreamIn* wxMediaStreamIn::Get(long *v)
 	  signed char bv;
 	  if (f->Read((char *)&bv, 1) != 1) {
 	    bad = 1;
-	    printf("25\n");
+	    BAD_PRINTF(("25\n"));
 	    *v = 0;
 	  } else
 	    *v = bv;
@@ -1013,7 +1022,7 @@ wxMediaStreamIn* wxMediaStreamIn::Get(long *v)
 	  unsigned char bl[4];
 	  if (f->Read((char *)bl, 4) != 4) {
 	    bad = 1;
-	    printf("27\n");
+	    BAD_PRINTF(("27\n"));
 	    *v = 0;
 	  } else
 	    *v = (((long)((signed char *)bl)[0]) << 24) 
@@ -1024,7 +1033,7 @@ wxMediaStreamIn* wxMediaStreamIn::Get(long *v)
 	unsigned char b2;
 	if (f->Read((char *)&b2, sizeof(char)) != sizeof(char)) {
 	  bad = 1;
-	  printf("28\n");
+	  BAD_PRINTF(("28\n"));
 	  *v = 0;
 	} else
 	  *v = (((int)(b & 0x3F)) << 8) | b2;