[svn-r7845] Purpose:

    Bug fix.

Description:
    The new routines added for H5MM_[m|c]alloc were causing the function
stack code to infinitely recurse while allocating room for the thread-specific
information (when thread-safety was turned on).

Solution:
    Call HDmalloc directly instead of H5MM_malloc

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    Changed are not tested in h5committest

1 files changed, 1 insertions, 2 deletions

diff --git a/src/H5CS.c b/src/H5CS.c
index e670c54..0c02034 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -27,7 +27,6 @@
  */
 #include "H5private.h"		/* Generic Functions			  */
 #include "H5FSprivate.h"	/* Private function stack routines	  */
-#include "H5MMprivate.h"	/* Memory management functions		  */
 
 #ifdef H5_HAVE_FUNCSTACK
 
@@ -86,7 +85,7 @@ H5FS_get_stack(void)
     fstack = pthread_getspecific(H5TS_funcstk_key_g);
     if (!fstack) {
         /* no associated value with current thread - create one */
-        fstack = (H5FS_t *)H5MM_calloc(sizeof(H5FS_t));
+        fstack = (H5FS_t *)HDmalloc(sizeof(H5FS_t));  /* Don't use H5MM_malloc() here, it causes infinite recursion */
         pthread_setspecific(H5TS_funcstk_key_g, (void *)fstack);
     }