2008-02-29 Hans Boehm <Hans.Boehm@hp.com>

	* pthread_support.c: Fix typo in comment.
	* os_dep.c (GC_win32_get_mem): Add heap section only if
	allocation succeeded.

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b47ebec9..67592f25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-29  Hans Boehm <Hans.Boehm@hp.com>
+
+	* pthread_support.c: Fix typo in comment.
+	* os_dep.c (GC_win32_get_mem): Add heap section only if
+	allocation succeeded.
+
 2008-02-28  Hans Boehm <Hans.Boehm@hp.com>
 
 	* malloc.c: (free replacement) Fix caller address space check.
diff --git a/os_dep.c b/os_dep.c
index fbcd15d8..f4033756 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -1953,7 +1953,7 @@ ptr_t GC_win32_get_mem(word bytes)
     	/* If I read the documentation correctly, this can	*/
     	/* only happen if HBLKSIZE > 64k or not a power of 2.	*/
     if (GC_n_heap_bases >= MAX_HEAP_SECTS) ABORT("Too many heap sections");
-    GC_heap_bases[GC_n_heap_bases++] = result;
+    if (0 != result) GC_heap_bases[GC_n_heap_bases++] = result;
     return(result);			  
 }
 
diff --git a/pthread_support.c b/pthread_support.c
index b028be7f..8ca1a3a6 100644
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -153,7 +153,7 @@ unsigned long GC_lock_holder = NO_THREAD;
 #if defined(GC_USE_DL_WRAP) || defined(GC_USE_DLOPEN_WRAP)
 /* Define GC_ functions as aliases for the plain ones, which will	*/
 /* be intercepted.  This allows files which include gc.h, and hence	*/
-/* generate referemces to the GC_ symbols, to see the right symbols.	*/
+/* generate references to the GC_ symbols, to see the right symbols.	*/
       int GC_pthread_create(pthread_t * t, const pthread_attr_t * a,
 		         void * (* fn)(void *), void * arg) {
 	  return pthread_create(t, a, fn, arg);