Merge pull request #2754 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:testhdf5_ref_valgrind to develop

* commit '4f0283db788fc1a0db94e7825567210021b3b594':
  Fixes a size mismatch when copying old-style to new-style references
  Fixes memory leads in trefer.c

3 files changed, 28 insertions, 26 deletions

diff --git a/src/H5Rint.c b/src/H5Rint.c
index 0acc887..ae72b47 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -822,7 +822,7 @@ H5R__set_obj_token(H5R_ref_priv_t *ref, const H5O_token_t *obj_token,
     HDassert(token_size);
     HDassert(token_size <= H5O_MAX_TOKEN_SIZE);
 
-    H5MM_memcpy(&ref->info.obj.token, obj_token, sizeof(H5O_token_t));
+    H5MM_memcpy(&ref->info.obj.token, obj_token, token_size);
     HDassert(token_size <= 255);
     ref->token_size = (uint8_t)token_size;
 
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 15658cc..8bf36f0 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -3641,7 +3641,7 @@ H5T__conv_ref(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                         if(0 == (buf_size = src->shared->u.atomic.u.r.cls->getsize(
                                 src->shared->u.atomic.u.r.file, s, src->shared->size,
                                 dst->shared->u.atomic.u.r.file, &dst_copy)))
-                            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "incorrect size")
+                            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to obtain size of reference")
 
                         /* Check if conversion buffer is large enough, resize if necessary. */
                         if(conv_buf_size < buf_size) {
diff --git a/test/trefer.c b/test/trefer.c
index b90ec45..4bf5c17 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -1135,11 +1135,11 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
     hsize_t *coords;                /* Coordinate buffer */
     hsize_t low[SPACE2_RANK];       /* Selection bounds */
     hsize_t high[SPACE2_RANK];      /* Selection bounds */
-    H5R_ref_t *wbuf,                /* buffer to write to disk */
-              *rbuf;                /* buffer read from disk */
+    H5R_ref_t *wbuf = NULL,         /* buffer to write to disk */
+              *rbuf = NULL;         /* buffer read from disk */
     H5R_ref_t  nvrbuf[3]={{{{0}}},{{{101}}},{{{255}}}}; /* buffer with non-valid refs */
-    uint8_t *dwbuf,                 /* Buffer for writing numeric data to disk */
-            *drbuf;                 /* Buffer for reading numeric data from disk */
+    uint8_t *dwbuf = NULL,          /* Buffer for writing numeric data to disk */
+            *drbuf = NULL;          /* Buffer for reading numeric data from disk */
     uint8_t *tu8;                   /* Temporary pointer to uint8 data */
     H5O_type_t obj_type;            /* Type of object */
     int i, j;                       /* Counters */
@@ -1537,13 +1537,14 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
             CHECK(ret, FAIL, "H5Rdestroy");
         }
 
-        /* Free memory buffers */
-        HDfree(wbuf);
-        HDfree(rbuf);
-        HDfree(dwbuf);
-        HDfree(drbuf);
-
     }
+
+    /* Free memory buffers */
+    HDfree(wbuf);
+    HDfree(rbuf);
+    HDfree(dwbuf);
+    HDfree(drbuf);
+
 }   /* test_reference_region() */
 
 /****************************************************************
@@ -1576,10 +1577,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high)
     hsize_t *coords;                /* Coordinate buffer */
     hsize_t low[SPACE3_RANK];       /* Selection bounds */
     hsize_t high[SPACE3_RANK];      /* Selection bounds */
-    H5R_ref_t *wbuf,                   /* buffer to write to disk */
-           *rbuf;                   /* buffer read from disk */
-    uint8_t *dwbuf,                 /* Buffer for writing numeric data to disk */
-            *drbuf;                 /* Buffer for reading numeric data from disk */
+    H5R_ref_t *wbuf = NULL,         /* buffer to write to disk */
+              *rbuf = NULL;         /* buffer read from disk */
+    uint8_t *dwbuf = NULL,          /* Buffer for writing numeric data to disk */
+            *drbuf = NULL;          /* Buffer for reading numeric data from disk */
     uint8_t *tu8;                   /* Temporary pointer to uint8 data */
     H5O_type_t obj_type;            /* Object type */
     int i;                          /* Counter */
@@ -1876,13 +1877,14 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high)
             CHECK(ret, FAIL, "H5Rdestroy");
         }
 
-        /* Free memory buffers */
-        HDfree(wbuf);
-        HDfree(rbuf);
-        HDfree(dwbuf);
-        HDfree(drbuf);
-
     }
+
+    /* Free memory buffers */
+    HDfree(wbuf);
+    HDfree(rbuf);
+    HDfree(dwbuf);
+    HDfree(drbuf);
+
 }   /* test_reference_region_1D() */
 
 /****************************************************************
@@ -2718,10 +2720,10 @@ test_reference_compat_conv(void)
     hsize_t count[SPACE2_RANK]; /* Element count of hyperslab */
     hsize_t block[SPACE2_RANK]; /* Block size of hyperslab  */
     hsize_t coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
-    hobj_ref_t *wbuf_obj;       /* Buffer to write to disk  */
-    H5R_ref_t     *rbuf_obj;       /* Buffer read from disk    */
-    hdset_reg_ref_t  *wbuf_reg; /* Buffer to write to disk  */
-    H5R_ref_t           *rbuf_reg; /* Buffer read from disk    */
+    hobj_ref_t      *wbuf_obj = NULL;   /* Buffer to write to disk  */
+    H5R_ref_t       *rbuf_obj = NULL;   /* Buffer read from disk    */
+    hdset_reg_ref_t *wbuf_reg = NULL;   /* Buffer to write to disk  */
+    H5R_ref_t       *rbuf_reg = NULL;   /* Buffer read from disk    */
     H5O_type_t       obj_type;  /* Object type              */
     herr_t  ret;                /* Generic return value     */
     unsigned int     i;         /* Counter                  */