Merge pull request #1571 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop

* commit '8a4371f69ae07619fa9561431b9ee9df9d5b3e47':
  Minor fix in h5str_sprintf for NULL region references

3 files changed, 3 insertions, 3 deletions

diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c
index e47515d..eaa356e 100644
--- a/java/src/jni/h5aImp.c
+++ b/java/src/jni/h5aImp.c
@@ -1389,7 +1389,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_reg_ref: buf length < 0");
     }
 
-    if (NULL == (ref_data = (hdset_reg_ref_t *) HDmalloc((size_t)n * sizeof(hdset_reg_ref_t))))
+    if (NULL == (ref_data = (hdset_reg_ref_t *) HDcalloc(1, (size_t)n * sizeof(hdset_reg_ref_t))))
         H5_JNI_FATAL_ERROR(ENVONLY, "H5Aread_reg_ref: failed to allocate read buffer");
 
     if ((status = H5Aread((hid_t)attr_id, (hid_t)mem_type_id, ref_data)) < 0)
diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c
index 92a3723..d46773a 100644
--- a/java/src/jni/h5dImp.c
+++ b/java/src/jni/h5dImp.c
@@ -1633,7 +1633,7 @@ Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_reg_ref: buf length < 0");
     }
 
-    if (NULL == (ref_data = (hdset_reg_ref_t *) HDmalloc((size_t)n * sizeof(hdset_reg_ref_t))))
+    if (NULL == (ref_data = (hdset_reg_ref_t *) HDcalloc(1, (size_t)n * sizeof(hdset_reg_ref_t))))
         H5_JNI_FATAL_ERROR(ENVONLY, "H5Dread_reg_ref: failed to allocate read buffer");
 
     if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id, xfer_plist_id, ref_data)) < 0)
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index fce969e..10ca3f2 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -978,7 +978,7 @@ h5str_sprintf
 
         case H5T_REFERENCE:
         {
-            if (h5str_is_zero(cptr, 99)) {
+            if (h5str_is_zero(cptr, typeSize)) {
                 if (!h5str_append(out_str, "NULL"))
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
                 break;