From 15b28ad04ab6894cfd308d7855798b6ed82305bc Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 9 Jan 2007 09:34:57 -0500 Subject: [svn-r13125] Description: Add extra protection for sanity checks, when assertions are enabled. Tested on: Linux/32 2.6 (chicago) --- src/H5FDlog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/H5FDlog.c b/src/H5FDlog.c index c317355..06212e8 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -1161,8 +1161,10 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add assert(buf); /* Verify that we are writing out the type of data we allocated in this location */ - assert(type==H5FD_MEM_DEFAULT || type==(H5FD_mem_t)file->flavor[addr] || (H5FD_mem_t)file->flavor[addr]==H5FD_MEM_DEFAULT); - assert(type==H5FD_MEM_DEFAULT || type==(H5FD_mem_t)file->flavor[(addr+size)-1] || (H5FD_mem_t)file->flavor[(addr+size)-1]==H5FD_MEM_DEFAULT); + if(file->flavor) { + assert(type==H5FD_MEM_DEFAULT || type==(H5FD_mem_t)file->flavor[addr] || (H5FD_mem_t)file->flavor[addr]==H5FD_MEM_DEFAULT); + assert(type==H5FD_MEM_DEFAULT || type==(H5FD_mem_t)file->flavor[(addr+size)-1] || (H5FD_mem_t)file->flavor[(addr+size)-1]==H5FD_MEM_DEFAULT); + } /* end if */ /* Check for overflow conditions */ if (HADDR_UNDEF==addr) -- cgit v0.12