[svn-r17354] Description:

	Bring r17351 from trunk to 1.8 branch:

	Clean up code (to align w/future sblock_mdc branch changes), tweak
tests for [slightly] easier debugging, fix memory leak when copying chunked
datasets with I/O filters, fix memory leak of free space section when it was
exactly the right size to use for extending an existing block in the file.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
	(h5committest performed on trunk)

1 files changed, 4 insertions, 0 deletions

diff --git a/src/H5C.c b/src/H5C.c
index 56b608d..68b20a5 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -6202,6 +6202,10 @@ H5C_protect(H5F_t *	        f,
 
     if ( entry_ptr != NULL ) {
 
+        /* Check for trying to load the wrong type of entry from an address */
+        if(entry_ptr->type != type)
+            HGOTO_ERROR(H5E_CACHE, H5E_BADTYPE, NULL, "not a dataset creation property list")
+
         hit = TRUE;
         thing = (void *)entry_ptr;