[svn-r25050] Description:

    Bring r24995 and r24998 from the trunk to the 1.8 branch:

r24995:
Improve checks for NULL buffer from user during H5Dread/H5Dwrite calls.

r24998:
Check in Neil's changes for correctly handling case where library is
reinitialized through a deprecated routine.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/serial & paralle
    (change has baked on trunk for >7 days)

1 files changed, 13 insertions, 10 deletions

diff --git a/src/H5G.c b/src/H5G.c
index 0cfa06b..cbd47ba 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -224,16 +224,19 @@ H5G_term_interface(void)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(H5_interface_initialize_g) {
-	if((n = H5I_nmembers(H5I_GROUP)))
-	    H5I_clear_type(H5I_GROUP, FALSE, FALSE);
-	else {
-	    /* Destroy the group object id group */
-	    H5I_dec_type_ref(H5I_GROUP);
-
-	    /* Mark closed */
-	    H5_interface_initialize_g = 0;
-	    n = 1; /*H5I*/
-	} /* end else */
+        if((n = H5I_nmembers(H5I_GROUP)))
+            H5I_clear_type(H5I_GROUP, FALSE, FALSE);
+        else {
+            /* Close deprecated interface */
+            n += H5G__term_deprec_interface();
+
+            /* Destroy the group object id group */
+            H5I_dec_type_ref(H5I_GROUP);
+
+            /* Mark closed */
+            H5_interface_initialize_g = 0;
+            n = 1; /*H5I*/
+        } /* end else */
     } /* end if */
 
     FUNC_LEAVE_NOAPI(n)