1 files changed, 4 insertions, 2 deletions
diff --git a/test/big.c b/test/big.c
index 5a70c26..7465e47 100644
--- a/test/big.c
+++ b/test/big.c
@@ -395,7 +395,8 @@ writer (char* filename, hid_t fapl, fsizes_t testsize, int wrt_n)
         break;
 
     default:
-        HDassert(0 && "Invalid test size.");
+        HDfprintf(stdout, "Unexpected file size(%d)\n", testsize);
+        goto error;
         break;
     }
 
@@ -435,7 +436,8 @@ writer (char* filename, hid_t fapl, fsizes_t testsize, int wrt_n)
     hs_size[0] = WRT_SIZE;
     if ((mem_space = H5Screate_simple (1, hs_size, hs_size)) < 0) goto error;
     for (i=0; i<wrt_n; i++) {
-        hs_start[0] = randll (size2[0], i);
+	/* start position must be at least hs_size from the end */
+        hs_start[0] = randll (size2[0]-hs_size[0], i);
         HDfprintf (out, "#%03d 0x%016Hx\n", i, hs_start[0]);
         if (H5Sselect_hyperslab (space2, H5S_SELECT_SET, hs_start, NULL,
                 hs_size, NULL) < 0) goto error;