[svn-r29202] Fix for unknown message HDFFV-9697.

Tested on jam, ostrich, platypus, kite, quail, osx1010test, emu, mayll, moohan.

12 files changed, 435 insertions, 205 deletions

diff --git a/src/H5Dint.c b/src/H5Dint.c
index fe34718..733ffe7 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -945,15 +945,21 @@ H5D__update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get dataset creation property list")
 
     /* Check whether to add a "bogus" message */
-    if(H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME) > 0) {
+    if( (H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME) > 0) &&
+        (H5P_exist_plist(dc_plist, H5O_BOGUS_MSG_ID_NAME) > 0) ) {
+
         uint8_t bogus_flags = 0;        /* Flags for creating "bogus" message */
+	unsigned bogus_id;		/* "bogus" ID */
 
+	/* Retrieve "bogus" message ID */
+        if(H5P_get(dc_plist, H5O_BOGUS_MSG_ID_NAME, &bogus_id) < 0)
+	    HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get bogus ID options")
         /* Retrieve "bogus" message flags */
         if(H5P_get(dc_plist, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get bogus message options")
 
         /* Add a "bogus" message (for error testing). */
-        if(H5O_bogus_oh(file, dxpl_id, oh, (unsigned)bogus_flags) < 0)
+	if(H5O_bogus_oh(file, dxpl_id, oh, bogus_id, (unsigned)bogus_flags) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create 'bogus' message")
     } /* end if */
 }
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index be324d0..ab2ef9e 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -359,7 +359,7 @@ H5_DLL herr_t H5F__super_free(H5F_super_t *sblock);
 
 /* Superblock extension related routines */
 H5_DLL herr_t H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr);
-H5_DLL herr_t H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, void *mesg, unsigned id, hbool_t may_create);
+H5_DLL herr_t H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, unsigned id, void *mesg, hbool_t may_create);
 H5_DLL herr_t H5F_super_ext_remove_msg(H5F_t *f, hid_t dxpl_id, unsigned id);
 H5_DLL herr_t H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
     hbool_t was_created);
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 332dfa6..6b4613d 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -622,7 +622,7 @@ H5F__super_read(H5F_t *f, hid_t dxpl_id)
 		f->shared->sblock = sblock;
 #endif /* JRM */
 
-                if(H5F_super_ext_write_msg(f, dxpl_id, &drvinfo, H5O_DRVINFO_ID, FALSE) < 0)
+		if(H5F_super_ext_write_msg(f, dxpl_id, H5O_DRVINFO_ID, &drvinfo, FALSE) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "error in writing message to superblock extension")
 
 #if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */
@@ -959,7 +959,7 @@ H5F__super_init(H5F_t *f, hid_t dxpl_id)
 	    for(type = H5FD_MEM_SUPER; type < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t, type))
                 fsinfo.fs_addr[type-1] = HADDR_UNDEF;
 
-            if(H5O_msg_create(&ext_loc, H5O_FSINFO_ID, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &fsinfo, dxpl_id) < 0)
+	    if(H5O_msg_create(&ext_loc, H5O_FSINFO_ID, H5O_MSG_FLAG_DONTSHARE, H5O_UPDATE_TIME, &fsinfo, dxpl_id) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to update free-space info header message")
 	} /* end if */
     } /* end if */
@@ -1197,7 +1197,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, void *mesg, unsigned id, hbool_t may_create)
+H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, unsigned id, void *mesg, hbool_t may_create)
 {
     H5P_genplist_t *dxpl = NULL;        /* DXPL for setting ring */
     H5AC_ring_t orig_ring = H5AC_RING_INV;      /* Original ring value */
diff --git a/src/H5MF.c b/src/H5MF.c
index 52ea82a..00a1ed8 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -1237,7 +1237,7 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
 
 	/* Write free-space manager info message to superblock extension object header */
 	/* Create the superblock extension object header in advance if needed */
-	if(H5F_super_ext_write_msg(f, dxpl_id, &fsinfo, H5O_FSINFO_ID, TRUE) < 0)
+	if(H5F_super_ext_write_msg(f, dxpl_id, H5O_FSINFO_ID, &fsinfo, TRUE) < 0)
 	    HGOTO_ERROR(H5E_RESOURCE, H5E_WRITEERROR, FAIL, "error in writing message to superblock extension")
 
 	/* Re-allocate free-space manager header and/or section info header */
@@ -1272,7 +1272,7 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
 
 	/* Update the free space manager info message in superblock extension object header */
 	if(update)
-            if(H5F_super_ext_write_msg(f, dxpl_id, &fsinfo, H5O_FSINFO_ID, FALSE) < 0)
+	    if(H5F_super_ext_write_msg(f, dxpl_id, H5O_FSINFO_ID, &fsinfo, FALSE) < 0)
 	        HGOTO_ERROR(H5E_RESOURCE, H5E_WRITEERROR, FAIL, "error in writing message to superblock extension")
 
 	/* Final close of free-space managers */
diff --git a/src/H5O.c b/src/H5O.c
index 503c978..1937483 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -112,9 +112,9 @@ const H5O_msg_class_t *const H5O_msg_class_g[] = {
     H5O_MSG_EFL,		/*0x0007 Data storage -- external data files */
     H5O_MSG_LAYOUT,		/*0x0008 Data Layout			*/
 #ifdef H5O_ENABLE_BOGUS
-    H5O_MSG_BOGUS,		/*0x0009 "Bogus" (for testing)		*/
+    H5O_MSG_BOGUS_VALID,	/*0x0009 "Bogus valid" (for testing)	*/
 #else /* H5O_ENABLE_BOGUS */
-    NULL,			/*0x0009 "Bogus" (for testing)		*/
+    NULL,			/*0x0009 "Bogus valid" (for testing)	*/
 #endif /* H5O_ENABLE_BOGUS */
     H5O_MSG_GINFO,		/*0x000A Group information		*/
     H5O_MSG_PLINE,		/*0x000B Data storage -- filter pipeline */
@@ -131,6 +131,11 @@ const H5O_msg_class_t *const H5O_msg_class_g[] = {
     H5O_MSG_REFCOUNT,		/*0x0016 Object's ref. count		*/
     H5O_MSG_FSINFO,		/*0x0017 Free-space manager info message */
     H5O_MSG_UNKNOWN,		/*0x0018 Placeholder for unknown message */
+#ifdef H5O_ENABLE_BOGUS
+    H5O_MSG_BOGUS_INVALID, 	/*0x0019 "Bogus invalid" (for testing) 	*/
+#else /* H5O_ENABLE_BOGUS */
+    NULL,                      /*0x0019 "Bogus invalid" (for testing)  	*/
+#endif /* H5O_ENABLE_BOGUS */
 };
 
 /* Declare a free list to manage the H5O_t struct */
@@ -2141,9 +2146,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_flags)
+H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned bogus_id, unsigned mesg_flags)
 {
     size_t	idx;                /* Local index variable */
+    H5O_msg_class_t *type;	    /* Message class type */
     herr_t ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
@@ -2153,7 +2159,8 @@ H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_flags)
 
     /* Look for existing message */
     for(idx = 0; idx < oh->nmesgs; idx++)
-	if(H5O_MSG_BOGUS == oh->mesg[idx].type)
+	if(H5O_MSG_BOGUS_VALID == oh->mesg[idx].type || 
+	   H5O_MSG_BOGUS_INVALID == oh->mesg[idx].type)
             break;
 
     /* Create a new message */
@@ -2167,8 +2174,15 @@ H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_flags)
         /* Update the native value */
         bogus->u = H5O_BOGUS_VALUE;
 
+	if(bogus_id == H5O_BOGUS_VALID_ID)
+	    type = H5O_MSG_BOGUS_VALID;
+	else if(bogus_id == H5O_BOGUS_INVALID_ID)
+	    type = H5O_MSG_BOGUS_INVALID;
+	else
+	    HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID for 'bogus' message")
+
         /* Allocate space in the object header for bogus message */
-	if(H5O_msg_alloc(f, dxpl_id, oh, H5O_MSG_BOGUS, &mesg_flags, bogus, &idx) < 0)
+	if(H5O_msg_alloc(f, dxpl_id, oh, type, &mesg_flags, bogus, &idx) < 0)
 	    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to allocate space for 'bogus' message")
 
         /* Point to "bogus" information (take it over) */
diff --git a/src/H5Obogus.c b/src/H5Obogus.c
index de205f6..d1085c8 100644
--- a/src/H5Obogus.c
+++ b/src/H5Obogus.c
@@ -47,9 +47,9 @@ static herr_t H5O_bogus_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *
 			     int indent, int fwidth);
 
 /* This message derives from H5O message class */
-const H5O_msg_class_t H5O_MSG_BOGUS[1] = {{
-    H5O_BOGUS_ID,            	/*message id number             */
-    "bogus",                 	/*message name for debugging    */
+const H5O_msg_class_t H5O_MSG_BOGUS_VALID[1] = {{
+    H5O_BOGUS_VALID_ID,		/*message id number             */
+    "bogus valid",             	/*message name for debugging    */
     0,     	                /*native message size           */
     0,				/* messages are sharable?       */
     H5O_bogus_decode,        	/*decode message                */
@@ -70,6 +70,30 @@ const H5O_msg_class_t H5O_MSG_BOGUS[1] = {{
     H5O_bogus_debug         	/*debug the message             */
 }};
 
+/* This message derives from H5O message class */
+const H5O_msg_class_t H5O_MSG_BOGUS_INVALID[1] = {{
+    H5O_BOGUS_INVALID_ID, 	/*message id number             */
+    "bogus invalid",          	/*message name for debugging    */
+    0,                          /*native message size           */
+    0,                          /* messages are sharable?       */
+    H5O_bogus_decode,           /*decode message                */
+    H5O_bogus_encode,           /*encode message                */
+    NULL,                       /*copy the native value         */
+    H5O_bogus_size,             /*raw message size              */
+    NULL,                       /*free internal memory          */
+    NULL,                       /*free method                   */
+    NULL,                       /* file delete method           */
+    NULL,                       /* link method                  */
+    NULL,                       /*set share method              */
+    NULL,                       /*can share method              */
+    NULL,                       /* pre copy native value to file */
+    NULL,                       /* copy native value to file    */
+    NULL,                       /* post copy native value to file    */
+    NULL,                       /* get creation index           */
+    NULL,                       /* set creation index           */
+    H5O_bogus_debug             /*debug the message             */
+}};
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5O_bogus_decode
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 945d12e..f74966e 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -1149,10 +1149,6 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
         else
             id = *chunk_image++;
 
-        /* Check for unknown message ID getting encoded in file */
-        if(id >= H5O_UNKNOWN_ID)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "'unknown' message ID encoded in file?!?")
-
         /* Message size */
         UINT16DECODE(chunk_image, mesg_size);
         HDassert(mesg_size == H5O_ALIGN_OH(oh, mesg_size));
@@ -1222,8 +1218,13 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
 
             /* Point unknown messages at 'unknown' message class */
             /* (Usually from future versions of the library) */
-            if(id >= NELMTS(H5O_msg_class_g) || NULL == H5O_msg_class_g[id]) {
-                H5O_unknown_t *unknown;     /* Pointer to "unknown" message info */
+	    if(id >= H5O_UNKNOWN_ID ||
+#ifdef H5O_ENABLE_BOGUS
+	       id == H5O_BOGUS_VALID_ID ||
+#endif
+	       NULL == H5O_msg_class_g[id]) {
+
+		H5O_unknown_t *unknown;     /* Pointer to "unknown" message info */
 
                 /* Allocate "unknown" message info */
                 if(NULL == (unknown = H5FL_MALLOC(H5O_unknown_t)))
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index 642e938..cc1b289 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -31,7 +31,7 @@
 #define H5O_NMESGS	8 		/*initial number of messages	     */
 #define H5O_NCHUNKS	2		/*initial number of chunks	     */
 #define H5O_MIN_SIZE	22		/* Min. obj header data size (must be big enough for a message prefix and a continuation message) */
-#define H5O_MSG_TYPES   25              /* # of types of messages            */
+#define H5O_MSG_TYPES   26              /* # of types of messages            */
 #define H5O_MAX_CRT_ORDER_IDX 65535     /* Max. creation order index value   */
 
 /* Versions of object header structure */
@@ -440,11 +440,13 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_EFL[1];
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_LAYOUT[1];
 
 #ifdef H5O_ENABLE_BOGUS
-/* "Bogus" Message. (0x0009) */
+/* "Bogus valid" Message. (0x0009) */
+/* "Bogus invalid" Message. (0x0019) */
 /*
  * Used for debugging - should never be found in valid HDF5 file.
  */
-H5_DLLVAR const H5O_msg_class_t H5O_MSG_BOGUS[1];
+H5_DLLVAR const H5O_msg_class_t H5O_MSG_BOGUS_VALID[1];
+H5_DLLVAR const H5O_msg_class_t H5O_MSG_BOGUS_INVALID[1];
 #endif /* H5O_ENABLE_BOGUS */
 
 /* Group Information Message. (0x000a) */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 4ce8e59..77b2b51 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -98,7 +98,13 @@ typedef struct H5O_t H5O_t;
 #ifdef H5O_ENABLE_BOGUS
 #define H5O_BOGUS_MSG_FLAGS_NAME        "bogus msg flags"       /* Flags for 'bogus' message */
 #define H5O_BOGUS_MSG_FLAGS_SIZE        sizeof(uint8_t)
+
+/* bogus ID can be either (a) H5O_BOGUS_VALID_ID 0x0009 or (b) H5O_BOGUS_INVALID_ID 0x0019 */
+#define H5O_BOGUS_MSG_ID_NAME        "bogus msg id" 		/* ID for 'bogus' message */
+#define H5O_BOGUS_MSG_ID_SIZE        sizeof(unsigned)
+
 #endif /* H5O_ENABLE_BOGUS */
+
 #ifdef H5O_ENABLE_BAD_MESG_COUNT
 #define H5O_BAD_MESG_COUNT_NAME         "bad message count"       /* Flag setting bad message count */
 #define H5O_BAD_MESG_COUNT_SIZE         sizeof(hbool_t)
@@ -183,7 +189,7 @@ typedef struct H5O_copy_t {
 #define H5O_LINK_ID     0x0006          /* Link Message. */
 #define H5O_EFL_ID	0x0007          /* External File List Message  */
 #define H5O_LAYOUT_ID	0x0008          /* Data Layout Message.  */
-#define H5O_BOGUS_ID	0x0009          /* "Bogus" Message.  */
+#define H5O_BOGUS_VALID_ID	0x0009  /* "Bogus valid" Message.  */
 #define H5O_GINFO_ID	0x000a          /* Group info Message.  */
 #define H5O_PLINE_ID	0x000b          /* Filter pipeline message.  */
 #define H5O_ATTR_ID	0x000c          /* Attribute Message.  */
@@ -200,6 +206,7 @@ typedef struct H5O_copy_t {
 #define H5O_FSINFO_ID   0x0017          /* Free-space manager info message.  */
 #define H5O_UNKNOWN_ID  0x0018          /* Placeholder message ID for unknown message.  */
                                         /* (this should never exist in a file) */
+#define H5O_BOGUS_INVALID_ID	0x0019  /* "Bogus invalid" Message.  */
 
 /* Shared object message types.
  * Shared objects can be committed, in which case the shared message contains
@@ -755,7 +762,7 @@ H5_DLL herr_t H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id);
 H5_DLL herr_t H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
     hbool_t force);
 #ifdef H5O_ENABLE_BOGUS
-H5_DLL herr_t H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_flags);
+H5_DLL herr_t H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_id, unsigned mesg_flags);
 #endif /* H5O_ENABLE_BOGUS */
 H5_DLL herr_t H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr);
 H5_DLL herr_t H5O_get_hdr_info(const H5O_loc_t *oloc, hid_t dxpl_id, H5O_hdr_info_t *hdr);
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index e9ce686..fdd8744 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -21,8 +21,8 @@
  *              datasets that have "bogus" messages in their object header.
  */
 
-#include "H5private.h"
 #include "hdf5.h"
+#include "H5private.h"
 #include "H5Oprivate.h"
 
 #ifdef H5O_ENABLE_BOGUS
@@ -36,18 +36,21 @@
 #define FALSE 0
 #endif /* FALSE */
 
-int main(void)
-{
 #ifdef H5O_ENABLE_BOGUS
-    hid_t fid = -1;             /* File ID */
+
+/*
+ * Create datasets in the location (in "/" or "/group") with 
+ *   message id: (a) H5O_BOGUS_VALID_ID or (b)H5O_BOGUS_INVALID_ID
+ *   and various unknown message flags
+ */
+static int
+generate_datasets(hid_t loc_id, unsigned bogus_id) 
+{
     hid_t sid = -1;             /* Dataspace ID */
     hid_t dcpl = -1;            /* Dataset creation property list ID */
     hid_t did = -1;             /* Dataset ID */
     uint8_t bogus_flags = 0;    /* Flags for bogus message */
 
-    /* Create file for test datasets */
-    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
-
     /* Create dataspace for datasets */
     if((sid = H5Screate(H5S_SCALAR)) < 0) goto error;
 
@@ -57,8 +60,11 @@ int main(void)
     /* Add property for bogus message flags */
     if(H5Pinsert2(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, H5O_BOGUS_MSG_FLAGS_SIZE, &bogus_flags, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
 
+    /* Add property for bogus message ID */
+    if(H5Pinsert2(dcpl, H5O_BOGUS_MSG_ID_NAME, H5O_BOGUS_MSG_ID_SIZE, &bogus_id, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
+
     /* Create dataset with "bogus" message, but no message flags */
-    if((did = H5Dcreate2(fid, "/Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Set "fail if unknown and open for write" message flag for bogus message */
@@ -66,7 +72,7 @@ int main(void)
     if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
 
     /* Create second dataset, with "fail if unknown" message flag */
-    if((did = H5Dcreate2(fid, "/Dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Set "fail if unknown always" message flag for bogus message */
@@ -74,7 +80,7 @@ int main(void)
     if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
 
     /* Create third dataset, with "fail if unknown always" message flag */
-    if((did = H5Dcreate2(fid, "/Dataset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Set "mark if unknown" message flag for bogus message */
@@ -82,7 +88,7 @@ int main(void)
     if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
 
     /* Create fourth dataset, with "mark if unknown" message flag */
-    if((did = H5Dcreate2(fid, "/Dataset4", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset4", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Close dataset creation property list */
@@ -91,9 +97,6 @@ int main(void)
     /* Close dataspace */
     if(H5Sclose(sid) < 0) goto error;
 
-    /* Close file */
-    if(H5Fclose(fid) < 0) goto error;
-
     return 0;
 
 error:
@@ -101,6 +104,43 @@ error:
         H5Dclose(did);
         H5Sclose(sid);
         H5Pclose(dcpl);
+    } H5E_END_TRY;
+
+    return -1;
+} /* generate_datasets() */
+#endif
+
+int main(void)
+{
+#ifdef H5O_ENABLE_BOGUS
+    hid_t fid = -1;             /* File ID */
+    hid_t gid = -1;             /* Group ID */
+
+    /* Create file for test datasets */
+    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+
+    /* Create datasets in "/" group with bogus message H5O_BOGUS_VALID_ID */
+    if(generate_datasets(fid, H5O_BOGUS_VALID_ID) < 0)
+        goto error;
+
+    if((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Create datasets in "/group" with bogus message H5O_BOGUS_INVALID_ID */
+    if(generate_datasets(gid, H5O_BOGUS_INVALID_ID) < 0)
+        goto error;
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0) goto error;
+
+    /* Close file */
+    if(H5Fclose(fid) < 0) goto error;
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Gclose(gid);
         H5Fclose(fid);
     } H5E_END_TRY;
 #else /* H5O_ENABLE_BOGUS */
diff --git a/test/ohdr.c b/test/ohdr.c
index c0ec3d0..3b11539 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -295,6 +295,294 @@ error:
     return -1;
 } /* test_ohdr_cache() */
 
+/*
+ *  To test objects with unknown messages in a file with:
+ *  	a) H5O_BOGUS_VALID_ID:
+ *	   --the bogus_id is within the range of H5O_msg_class_g[]
+ *  	b) H5O_BOGUS_INVALID_ID:
+ *  	   --the bogus_id is outside the range of H5O_msg_class_g[]
+ *
+ *   The test file is FILE_BOGUS: "tbogus.h5" generated with gen_bogus.c
+ *   --objects that have unknown header messages with H5O_BOGUS_VALID_ID in "/"
+ *   --objects that have unknown header messages with H5O_BOGUS_INVALID_ID in "/group"
+ *
+ *   The test also uses the test file FILENAME[0] (ohdr.h5): the parameter "filename"
+ */
+static herr_t
+test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
+{
+    hid_t fid = -1;	/* file ID */
+    hid_t gid = -1;	/* group ID */
+    hid_t did = -1;	/* Dataset ID */
+    hid_t sid = -1;     /* Dataspace ID */
+    hid_t aid = -1;     /* Attribute ID */
+    hid_t loc = -1;	/* location: file or group ID */
+    hid_t fid_bogus = -1;	/* bogus file ID */
+    hid_t gid_bogus = -1;	/* bogus group ID */
+    hid_t loc_bogus = -1;	/* location: bogus file or group ID */
+    const char *testfile = H5_get_srcdir_filename(FILE_BOGUS);
+
+    TESTING("object with unknown header message and no flags set");
+
+    /* Open filename */
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+	TEST_ERROR
+
+    /* Open FILE_BOGUS */
+    if((fid_bogus = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in FILE_BOGUS */
+	if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc_bogus = gid_bogus;
+
+	/* Create "group" in filename */
+	if((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    FAIL_STACK_ERROR
+	loc = gid;
+
+    } else { /* H5O_BOGUS_VALID_ID */
+	loc_bogus = fid_bogus;
+	loc = fid;
+    }
+
+   /* Open the dataset with the unknown header message, but no extra flags */
+    if((did = H5Dopen2(loc_bogus, "Dataset1", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    PASSED();
+
+    TESTING("object in r/o file with unknown header message & 'fail if unknown and open for write' flag set");
+
+    /* Open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
+    if((did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    PASSED();
+
+    TESTING("object in r/o file with unknown header message & 'fail if unknown always' flag set");
+
+    /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
+    H5E_BEGIN_TRY {
+	did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(did >= 0) {
+	H5Dclose(did);
+	TEST_ERROR
+    } /* end if */
+
+    PASSED();
+
+    TESTING("object with unknown header message & 'mark if unknown' flag set");
+
+    /* Copy object with "mark if unknown" flag on message into file (FILENAME[0]) that can be modified */
+    if(H5Ocopy(loc_bogus, "Dataset4", loc, "Dataset4", H5P_DEFAULT, H5P_DEFAULT) < 0)
+	TEST_ERROR
+
+    /* Closing: filename */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    FAIL_STACK_ERROR
+    }
+    if(H5Fclose(fid) < 0)
+       TEST_ERROR
+
+    /* Re-open filename, with read-only permissions */
+    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in filename */
+	if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc = gid;
+    } else
+	loc = fid;
+
+    /* Open the dataset with the "mark if unknown" message */
+    if((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Check that the "unknown" message was _NOT_ marked */
+    if(H5O_check_msg_marked_test(did, FALSE) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    /* Close "group" in filename depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    FAIL_STACK_ERROR
+    }
+
+    /* Close filename (to flush change to object header) */
+    if(H5Fclose(fid) < 0)
+	TEST_ERROR
+
+    /* Re-open filename */
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in filename */
+	if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc = gid;
+    } else
+	loc = fid;
+
+    /* Open the dataset with the "mark if unknown" message */
+    if((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Create data space */
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
+	FAIL_STACK_ERROR
+
+    /* Create an attribute, to get the object header into write access */
+    if((aid = H5Acreate2(did, "Attr", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close dataspace */
+    if(H5Sclose(sid) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close attribute */
+    if(H5Aclose(aid) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    /* Close "group" in filename depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    FAIL_STACK_ERROR
+    }
+
+    /* Close filename (to flush change to object header) */
+    if(H5Fclose(fid) < 0)
+	TEST_ERROR
+
+    /* Re-open filename */
+    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in filename */
+	if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc = gid;
+    } else
+	loc = fid;
+
+    /* Re-open the dataset with the "mark if unknown" message */
+    if((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Check that the "unknown" message was marked */
+    if(H5O_check_msg_marked_test(did, TRUE) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    /* Closing: filename */ 
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    TEST_ERROR
+    }
+    if(H5Fclose(fid) < 0)
+	TEST_ERROR
+
+    PASSED();
+
+    /* Closing: FILE_BOGUS */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid_bogus) < 0)
+	    TEST_ERROR
+    }
+    if(H5Fclose(fid_bogus) < 0)
+	TEST_ERROR
+
+    TESTING("object in r/w file with unknown header message & 'fail if unknown and open for write' flag set");
+
+    /* Open FILE_BOGUS with RW intent this time */
+    if((fid_bogus = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in FILE_BOGUS */
+	if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc_bogus = gid_bogus;
+    } else
+	loc_bogus = fid_bogus;
+
+    /* Attempt to open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
+    H5E_BEGIN_TRY {
+	did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(did >= 0) {
+	H5Dclose(did);
+	TEST_ERROR
+    } /* end if */
+
+    PASSED();
+
+    TESTING("object in r/w file with unknown header message & 'fail if unknown always' flag set");
+
+    /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
+    H5E_BEGIN_TRY {
+	did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(did >= 0) {
+	H5Dclose(did);
+        TEST_ERROR
+    } /* end if */
+
+    /* Closing: FILE_BOGUS */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid_bogus) < 0)
+	    TEST_ERROR
+    }
+    if(H5Fclose(fid_bogus) < 0)
+	TEST_ERROR
+
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(fid);
+	H5Gclose(gid);
+        H5Fclose(fid_bogus);
+	H5Gclose(gid_bogus);
+	H5Dclose(did);
+	H5Sclose(sid);
+	H5Aclose(aid);
+    } H5E_END_TRY;
+
+    return -1;
+} /* test_unknown() */
+
 
 /*-------------------------------------------------------------------------
  * Function:	main
@@ -664,180 +952,28 @@ main(void)
 
         PASSED();
 
+        /* Close the file we created */
+        if(H5Fclose(file) < 0)
+            TEST_ERROR
 
         /* Test reading datasets with undefined object header messages
          * and the various "fail/mark if unknown" object header message flags
          */
-        HDputs("Accessing objects with unknown header messages:");
+	HDputs("Accessing objects with unknown header messages: H5O_BOGUS_VALID_ID");
         {
-            hid_t file2;                    /* File ID for 'bogus' object file */
-            hid_t sid;                      /* Dataspace ID */
-            hid_t aid;                      /* Attribute ID */
-            const char *testfile = H5_get_srcdir_filename(FILE_BOGUS);
-
-            TESTING("object with unknown header message and no flags set");
-
-            /* Open the file with objects that have unknown header messages (generated with gen_bogus.c) */
-            if((file2 = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Open the dataset with the unknown header message, but no extra flags */
-            if((dset = H5Dopen2(file2, "/Dataset1", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            PASSED();
-
-            TESTING("object in r/o file with unknown header message & 'fail if unknown and open for write' flag set");
-
-            /* Open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
-            if((dset = H5Dopen2(file2, "/Dataset2", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            PASSED();
-
-            TESTING("object in r/o file with unknown header message & 'fail if unknown always' flag set");
-
-            /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
-            H5E_BEGIN_TRY {
-                dset = H5Dopen2(file2, "/Dataset3", H5P_DEFAULT);
-            } H5E_END_TRY;
-            if(dset >= 0) {
-                H5Dclose(dset);
-                TEST_ERROR
-            } /* end if */
-
-            PASSED();
-
-            TESTING("object with unknown header message & 'mark if unknown' flag set");
-
-            /* Copy object with "mark if unknown" flag on message into file that can be modified */
-            if(H5Ocopy(file2, "/Dataset4", file, "/Dataset4", H5P_DEFAULT, H5P_DEFAULT) < 0)
-                TEST_ERROR
-
-            /* Close the file we created (to flush changes to file) */
-            if(H5Fclose(file) < 0)
-                TEST_ERROR
-
-            /* Re-open the file created, with read-only permissions */
-            if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-                TEST_ERROR
-
-            /* Open the dataset with the "mark if unknown" message */
-            if((dset = H5Dopen2(file, "/Dataset4", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Check that the "unknown" message was _NOT_ marked */
-            if(H5O_check_msg_marked_test(dset, FALSE) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close the dataset */
-            if(H5Dclose(dset) < 0)
+            if(test_unknown(H5O_BOGUS_VALID_ID, filename, fapl) < 0)
                 TEST_ERROR
+        }
 
-            /* Close the file we created (to flush change to object header) */
-            if(H5Fclose(file) < 0)
-                TEST_ERROR
-
-            /* Re-open the file created */
-            if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
-                TEST_ERROR
-
-            /* Open the dataset with the "mark if unknown" message */
-            if((dset = H5Dopen2(file, "/Dataset4", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Create data space */
-            if((sid = H5Screate(H5S_SCALAR)) < 0)
-                FAIL_STACK_ERROR
-
-            /* Create an attribute, to get the object header into write access */
-            if((aid = H5Acreate2(dset, "Attr", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close dataspace */
-            if(H5Sclose(sid) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close attribute */
-            if(H5Aclose(aid) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close the dataset */
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            /* Close the file we created (to flush change to object header) */
-            if(H5Fclose(file) < 0)
-                TEST_ERROR
-
-            /* Re-open the file created */
-            if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-                TEST_ERROR
-
-            /* Re-open the dataset with the "mark if unknown" message */
-            if((dset = H5Dopen2(file, "/Dataset4", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Check that the "unknown" message was marked */
-            if(H5O_check_msg_marked_test(dset, TRUE) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close the dataset */
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            /* Close the file with the bogus objects */
-            if(H5Fclose(file2) < 0)
-                TEST_ERROR
-
-            PASSED();
-
-            /* Open the file with objects that have unknown header messages (generated with gen_bogus.c) with RW intent this time */
-            if((file2 = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            TESTING("object in r/w file with unknown header message & 'fail if unknown and open for write' flag set");
-
-            /* Attempt to open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
-            H5E_BEGIN_TRY {
-                dset = H5Dopen2(file2, "/Dataset2", H5P_DEFAULT);
-            } H5E_END_TRY;
-            if(dset >= 0) {
-                H5Dclose(dset);
-                TEST_ERROR
-            } /* end if */
-
-            PASSED();
-
-            TESTING("object in r/w file with unknown header message & 'fail if unknown always' flag set");
-
-            /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
-            H5E_BEGIN_TRY {
-                dset = H5Dopen2(file2, "/Dataset3", H5P_DEFAULT);
-            } H5E_END_TRY;
-            if(dset >= 0) {
-                H5Dclose(dset);
-                TEST_ERROR
-            } /* end if */
-
-            /* Close the file with the bogus objects */
-            if(H5Fclose(file2) < 0)
+        HDputs("Accessing objects with unknown header messages: H5O_BOGUS_INVALID_ID");
+        {
+            if(test_unknown(H5O_BOGUS_INVALID_ID, filename, fapl) < 0)
                 TEST_ERROR
-
-            PASSED();
         }
 
-        /* Close the file we created */
-        if(H5Fclose(file) < 0)
-            TEST_ERROR
-
-	    /* Test object header creation metadata cache issues */
-	    if(test_ohdr_cache(filename, fapl) < 0)
-            TEST_ERROR
+	/* Test object header creation metadata cache issues */
+	if(test_ohdr_cache(filename, fapl) < 0)
+	    TEST_ERROR
     } /* end for */
 
     /* Verify symbol table messages are cached */
diff --git a/test/tbogus.h5 b/test/tbogus.h5
index 875fbd8..91ab76f 100644
--- a/test/tbogus.h5
+++ b/test/tbogus.h5