[svn-r13052] Fixed a bug that occured while eliminating "gaps" in object headers when

the gap came immediately before a null message.

Tested on smirom, kagiso, and copper.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index 1807a14..9e824d0 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -263,6 +263,13 @@ H5O_eliminate_gap(H5O_t *oh, H5O_mesg_t *mesg, uint8_t *gap_loc, size_t gap_size
             /* Adjust start of null message */
             mesg->raw -= gap_size;
         } /* end else */
+    }
+    else if(move_end == move_start && !null_before_gap) {
+	/* Slide null message up */
+	HDmemmove(move_start - gap_size, move_start, mesg->raw_size + H5O_SIZEOF_MSGHDR_OH(oh));
+
+	/* Adjust start of null message */
+	mesg->raw -= gap_size;
     } /* end if */
 
     /* Zero out addition to null message */