summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-12-20 19:23:48 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-12-20 19:23:48 (GMT)
commit23f813026f06f3ed9aa9fea86df265950eb6770f (patch)
tree5af0d5405e3bc04425928c8023cc82a32536d4a9
parentd7c38eeee9e6148686dc72610f244974fdd88f10 (diff)
downloadhdf5-23f813026f06f3ed9aa9fea86df265950eb6770f.zip
hdf5-23f813026f06f3ed9aa9fea86df265950eb6770f.tar.gz
hdf5-23f813026f06f3ed9aa9fea86df265950eb6770f.tar.bz2
HDFFV-10976,-10980 Init obj_type before calling H5Rget_obj_type3
-rw-r--r--java/src/jni/h5rImp.c2
-rw-r--r--java/src/jni/h5util.c2
-rw-r--r--tools/lib/h5diff_array.c4
-rw-r--r--tools/lib/h5tools_dump.c2
-rw-r--r--tools/lib/h5tools_str.c2
-rw-r--r--tools/src/h5ls/h5ls.c2
-rw-r--r--tools/testfiles/trefer_obj_delR.ddl2
7 files changed, 8 insertions, 8 deletions
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c
index 4ad5d5f..21ee658 100644
--- a/java/src/jni/h5rImp.c
+++ b/java/src/jni/h5rImp.c
@@ -452,7 +452,7 @@ JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3
(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id)
{
- H5O_type_t object_info;
+ H5O_type_t object_info = -1;
jboolean isCopy;
jbyte *refBuf = NULL;
int retVal = -1;
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 5f1bccb..5c82edc 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -1059,7 +1059,7 @@ h5str_sprintf
}
if (H5Tequal(tid, H5T_STD_REF)) {
- H5O_type_t obj_type; /* Object type */
+ H5O_type_t obj_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
const H5R_ref_t *ref_vp = (H5R_ref_t *)cptr;
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 637cfa8..ef13da0 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -753,8 +753,8 @@ static hsize_t diff_datum(
hid_t region2_id = -1;
H5R_ref_t *ref1_buf = (const H5R_ref_t *)_mem1;
H5R_ref_t *ref2_buf = (const H5R_ref_t *)_mem2;
- H5O_type_t obj1_type; /* Object type */
- H5O_type_t obj2_type; /* Object type */
+ H5O_type_t obj1_type = -1; /* Object type */
+ H5O_type_t obj2_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
ref_type = H5Rget_type(ref1_buf);
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 55d3a6b..eb73431 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -4084,7 +4084,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
}
}
for(i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
- H5O_type_t obj_type; /* Object type */
+ H5O_type_t obj_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "reference loop:%d with curr_pos=%ld", i, curr_pos);
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 67f44b1..f734cce 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -1093,7 +1093,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
h5tools_str_append(str, "NULL");
else {
if (H5Tequal(type, H5T_STD_REF)) {
- H5O_type_t obj_type; /* Object type */
+ H5O_type_t obj_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
const H5R_ref_t *ref_vp = (const H5R_ref_t *)vp;
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 6c21782..70af8cf 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -1313,7 +1313,7 @@ dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx
HDmemset(&buffer, 0, sizeof(h5tools_str_t));
for(i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
- H5O_type_t obj_type; /* Object type */
+ H5O_type_t obj_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "reference loop:%d with curr_pos=%ld", i, curr_pos);
diff --git a/tools/testfiles/trefer_obj_delR.ddl b/tools/testfiles/trefer_obj_delR.ddl
index 598998d..fa238a5 100644
--- a/tools/testfiles/trefer_obj_delR.ddl
+++ b/tools/testfiles/trefer_obj_delR.ddl
@@ -4,7 +4,7 @@ GROUP "/" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SCALAR
DATA {
- GROUP "trefer_obj_del.h5"
+ UNKNOWN "trefer_obj_del.h5"
}
}
}