mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correct miscellaneous mistakes (#6540)

Browse Source 
* Correct miscellaneous mistakes

- remove unused calloc'ed pointers
- correct the order of the arguments to memcpy

* Add entry
This commit is contained in:
bmribler
2026-07-21 14:21:59 -04:00
committed by GitHub
parent 8a48c7ced8
commit 33eac87eea
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src-jni/jni/h5util.c
+2 -8
View File
@@ -316,11 +316,11 @@ h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_
if (H5T_SGN_NONE == nsign) {
sscanf(token, "%hu", &tmp_ushort);
memcpy(&tmp_ushort, cptr, sizeof(unsigned short));
memcpy(cptr, &tmp_ushort, sizeof(unsigned short));
}
else {
sscanf(token, "%hd", &tmp_short);
memcpy(&tmp_short, cptr, sizeof(short));
memcpy(cptr, &tmp_short, sizeof(short));
}
break;
@@ -525,9 +525,6 @@ h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_
for (i = 0, total_elmts = 1; i < (hsize_t)rank; i++)
total_elmts *= dims[i];
if (NULL == (cptr = (char *)calloc((size_t)total_elmts, baseTypeSize)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_convert: failed to allocate array buffer");
for (i = 0; i < total_elmts; i++) {
if (!(h5str_convert(ENVONLY, &this_str, container, mtid, out_buf, i * baseTypeSize))) {
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -637,9 +634,6 @@ h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_
if (!(baseTypeSize = H5Tget_size(mtid)))
H5_LIBRARY_ERROR(ENVONLY);
if (NULL == (cptr = calloc(1, typeSize)))
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_convert: failed to allocate array buffer");
/* Convert real part */
if (!(h5str_convert(ENVONLY, &this_str, container, mtid, out_buf, 0))) {
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);