From 1e10b3212ed5904b69d9f4c4bcb4d0122dfd7c77 Mon Sep 17 00:00:00 2001
From: Vailin Choi <vchoi@jam.ad.hdfgroup.org>
Date: Thu, 5 Dec 2019 15:09:23 -0600
Subject: Two fixes: (1) Set the version for reference datatype messge to
 H5O_DTYPE_VERSION_4. (2) Verify the decoded version for hyperslab selection.

---
 src/H5Shyper.c | 3 +++
 src/H5Spkg.h   | 7 ++++---
 src/H5T.c      | 1 +
 test/trefer.c  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index acb8b87..1e1538e 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -4265,6 +4265,9 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p)
     /* Decode version */
     UINT32DECODE(pp, version);
 
+    if(version < H5S_HYPER_VERSION_1 || version > H5S_HYPER_VERSION_LATEST)
+        HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "bad version number for hyperslab selection")
+
     if(version >= (uint32_t)H5S_HYPER_VERSION_2) {
         /* Decode flags */
         flags = *(pp)++;
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index ba60cbf..e139bce 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -41,9 +41,10 @@
 #define H5S_SELECT_FLAG_BITS    (H5S_HYPER_REGULAR)
 
 /* Versions for H5S_SEL_HYPER selection info */
-#define H5S_HYPER_VERSION_1     1
-#define H5S_HYPER_VERSION_2     2
-#define H5S_HYPER_VERSION_3     3
+#define H5S_HYPER_VERSION_1         1
+#define H5S_HYPER_VERSION_2         2
+#define H5S_HYPER_VERSION_3         3
+#define H5S_HYPER_VERSION_LATEST    H5S_HYPER_VERSION_3
 
 /* Versions for H5S_SEL_POINTS selection info */
 #define H5S_POINT_VERSION_1     1
diff --git a/src/H5T.c b/src/H5T.c
index 9263158..f378357 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -254,6 +254,7 @@
     dt->shared->u.atomic.u.r.rtype = H5R_OBJECT2;           \
     dt->shared->u.atomic.u.r.opaque = TRUE;                 \
     dt->shared->u.atomic.u.r.version = H5R_ENCODE_VERSION;  \
+    dt->shared->version = H5O_DTYPE_VERSION_4;              \
 }
 
 /* Define the code templates for the "SIZE_TMPL" in the H5T_INIT_TYPE macro */
diff --git a/test/trefer.c b/test/trefer.c
index 7791ca1..a27dbc5 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -2811,7 +2811,7 @@ test_reference(void)
         for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
 
             /* Invalid combinations, just continue */
-            if(high == H5F_LIBVER_EARLIEST || high < low)
+            if(high <= H5F_LIBVER_V112 || high < low)
                 continue;
 
             test_reference_region(low, high);       /* Test basic H5R dataset region reference code */
-- 
cgit v0.12