[svn-r17021] Description:

    Make error handling for detecting overlaps between 'normal' and 'temporary'
space allocation more robust.

Tested on:
    FreeBSD/32 6.3 (duty) in debug mode
    FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
    Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
        in debug mode
    Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
        w/C++ & FORTRAN, in production mode
    Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
        w/szip filter, in production mode
    Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
        in production mode
    Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
    Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
    Mac OS X/32 10.5.7 (amazon) in debug mode
    Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
        in production mode

1 files changed, 5 insertions, 3 deletions

diff --git a/src/H5MF.c b/src/H5MF.c
index 8beac3b..a3769d1 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -382,9 +382,8 @@ HDfprintf(stderr, "%s: Check 2.0\n", FUNC);
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, HADDR_UNDEF, "can't allocate raw data")
     } /* end else */
 
-    /* Check for overlapping into file's temporary allocation space */
-    if(H5F_addr_gt((ret_value + size), f->shared->tmp_addr))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_BADRANGE, HADDR_UNDEF, "'normal' file space allocation request overlaps into 'temporary' file space")
+    /* Sanity check for overlapping into file's temporary allocation space */
+    HDassert(H5F_addr_le((ret_value + size), f->shared->tmp_addr));
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
@@ -428,6 +427,9 @@ H5MF_alloc_tmp(H5F_t *f, hsize_t size)
     haddr_t ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(H5MF_alloc_tmp, HADDR_UNDEF)
+#ifdef H5MF_ALLOC_DEBUG
+HDfprintf(stderr, "%s: size = %Hu\n", FUNC, size);
+#endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
     HDassert(f);