Fixes for JNI updates

1 files changed, 39 insertions, 0 deletions

diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index bed23c9..726e08c 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -174,6 +174,9 @@ Java_hdf_hdf5lib_H5__1H5Pcreate_1class
     close_callback = close_op;
     copy_callback = copy_op;
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "_H5Pcreate_class: class name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "_H5Pcreate_class: class name not pinned");
 
     if ((class_id = H5Pcreate_class((hid_t)parent_class, cstr, (H5P_cls_create_func_t)H5P_cls_create_cb, (void *) create_data,
@@ -201,6 +204,9 @@ Java_hdf_hdf5lib_H5__1H5Pcreate_1class_1nocb
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "_H5Pcreate_class_nocb: class name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "_H5Pcreate_class_nocb: class name not pinned");
 
     if ((class_id = H5Pcreate_class((hid_t)parent_class, cstr,  NULL, NULL, NULL, NULL, NULL, NULL)) < 0)
@@ -239,6 +245,9 @@ Java_hdf_hdf5lib_H5_H5Pregister2
     get_callback = prp_get;
     delete_callback = prp_delete;
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pregister2: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pregister2: property name not pinned");
 
     PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pregister2: default property value buffer not pinned");
@@ -271,6 +280,9 @@ Java_hdf_hdf5lib_H5_H5Pregister2_1nocb
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pregister2_nocb: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pregister2_nocb: property name not pinned");
 
     PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pregister2_nocb: default property value buffer not pinned");
@@ -310,6 +322,9 @@ Java_hdf_hdf5lib_H5_H5Pinsert2
     get_callback = prp_get;
     delete_callback = prp_delete;
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pinsert2: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pinsert2: property name not pinned");
 
     PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pinsert2: property value buffer not pinned");
@@ -342,6 +357,9 @@ Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pinsert2_nocb: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pinsert2_nocb: property name not pinned");
 
     PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pinsert2_nocb: property value buffer not pinned");
@@ -370,6 +388,9 @@ Java_hdf_hdf5lib_H5_H5Pset
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pset: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pset: property name not pinned");
 
     if ((retVal = H5Pset((hid_t)plid, cstr, &val)) < 0)
@@ -396,6 +417,9 @@ Java_hdf_hdf5lib_H5_H5Pexist
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pexist: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pexist: property name not pinned");
 
     if ((bval = H5Pexist((hid_t)plid, cstr)) < 0)
@@ -425,6 +449,9 @@ Java_hdf_hdf5lib_H5_H5Pget_1size
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pget_size: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pget_size: property name not pinned");
 
     if ((status = H5Pget_size((hid_t)plid, cstr, &size)) < 0)
@@ -541,6 +568,9 @@ Java_hdf_hdf5lib_H5_H5Pget
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pget: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pget: property name not pinned");
 
     if ((status = H5Pget((hid_t)plid, cstr, &val)) < 0)
@@ -629,6 +659,9 @@ Java_hdf_hdf5lib_H5_H5Pcopy_1prop
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pcopy_prop: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pcopy_prop: property name not pinned");
 
     if ((retVal = H5Pcopy_prop((hid_t)dst_plid, (hid_t)src_plid, cstr)) < 0)
@@ -655,6 +688,9 @@ Java_hdf_hdf5lib_H5_H5Premove
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Premove: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Premove: property name not pinned");
 
     if ((retVal = H5Premove((hid_t)plid, cstr)) < 0)
@@ -681,6 +717,9 @@ Java_hdf_hdf5lib_H5_H5Punregister
 
     UNUSED(clss);
 
+    if (NULL == name)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Punregister: property name is NULL");
+
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Punregister: property name not pinned");
 
     if ((retVal = H5Punregister((hid_t)plid, cstr)) < 0)