[svn-r17755] Purpose: Fix assertion failure caused by H5Tcommit1/2

Description:
Calling H5Tcommit_anon on a file with read only access would cause an
assertion failure.  Added a check to H5T_commit to return a failure in
this case.  Removed redundant check in H5T_commit_named.

Tested: Fedora 11 (very minor change)

2 files changed, 15 insertions, 4 deletions

diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index ebdf283..dea6bed 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -199,10 +199,6 @@ H5T_commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
     HDassert(tapl_id != H5P_DEFAULT);
     HDassert(dxpl_id != H5P_DEFAULT);
 
-    /* Check if we are allowed to write to this file */
-    if(0 == (H5F_INTENT(loc->oloc->file) & H5F_ACC_RDWR))
-        HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "no write intent on file")
-
     /* Record the type's state so that we can revert to it if linking fails */
     old_state = dt->shared->state;
 
@@ -338,6 +334,10 @@ H5T_commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id)
     HDassert(type);
     HDassert(tcpl_id != H5P_DEFAULT);
 
+    /* Check if we are allowed to write to this file */
+    if(0 == (H5F_INTENT(file) & H5F_ACC_RDWR))
+        HGOTO_ERROR(H5E_DATATYPE, H5E_WRITEERROR, FAIL, "no write intent on file")
+
     /*
      * Check arguments.  We cannot commit an immutable type because H5Tclose()
      * normally fails on such types (try H5Tclose(H5T_NATIVE_INT)) but closing
diff --git a/test/dtypes.c b/test/dtypes.c
index 51f8f6d..2619f1b 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -3727,6 +3727,17 @@ test_named (hid_t fapl)
         goto error;
     }
 
+    /* Verify that H5Tcommit_anon returns an error */
+    if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) goto error;
+    H5E_BEGIN_TRY {
+        status = H5Tcommit_anon(file, type, H5P_DEFAULT, H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(status >= 0) {
+        H5_FAILED();
+        HDputs ("    Types should not be committable to a read-only file!");
+        goto error;
+    }
+
     /* Close */
     if(H5Tclose(type) < 0) goto error;
     if(H5Fclose(file) < 0) goto error;