mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-27 08:01:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory bug in selection I/O (#2096)

Browse Source 
* Fix memory bug in selection I/O

* Change error messages for calls to H5I_remove() in
H5FD_read/write_selection()
This commit is contained in:
Neil Fortner 2022-09-14 11:10:05 -05:00 committed by GitHub
parent fe9c07fd90
commit b5598575bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/H5FDint.c
View File

@ -1170,8 +1170,8 @@ H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_s
if ((file_space_ids[num_spaces] = H5I_register(H5I_DATASPACE, file_spaces[num_spaces], TRUE)) <
0) {
if (H5I_dec_app_ref(mem_space_ids[num_spaces]) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "problem freeing id")
if (NULL == H5I_remove(mem_space_ids[num_spaces]))
HDONE_ERROR(H5E_VFL, H5E_CANTREMOVE, FAIL, "problem removing id")
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
}
}
@ -1200,12 +1200,14 @@ done:
}
}
/* Cleanup dataspace arrays */
/* Cleanup dataspace arrays. Use H5I_remove() so we only close the IDs and
* not the underlying dataspaces, which were not created by this function.
*/
for (i = 0; i < num_spaces; i++) {
if (H5I_dec_app_ref(mem_space_ids[i]) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "problem freeing id")
if (H5I_dec_app_ref(file_space_ids[i]) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "problem freeing id")
if (NULL == H5I_remove(mem_space_ids[i]))
HDONE_ERROR(H5E_VFL, H5E_CANTREMOVE, FAIL, "problem removing id")
if (NULL == H5I_remove(file_space_ids[i]))
HDONE_ERROR(H5E_VFL, H5E_CANTREMOVE, FAIL, "problem removing id")
}
if (mem_space_ids != mem_space_ids_local)
mem_space_ids = H5MM_xfree(mem_space_ids);
@ -1805,8 +1807,8 @@ H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_
if ((file_space_ids[num_spaces] = H5I_register(H5I_DATASPACE, file_spaces[num_spaces], TRUE)) <
0) {
if (H5I_dec_app_ref(mem_space_ids[num_spaces]) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "problem freeing id")
if (NULL == H5I_remove(mem_space_ids[num_spaces]))
HDONE_ERROR(H5E_VFL, H5E_CANTREMOVE, FAIL, "problem removing id")
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID")
}
}
@ -1835,12 +1837,14 @@ done:
}
}
/* Cleanup dataspace arrays */
/* Cleanup dataspace arrays. Use H5I_remove() so we only close the IDs and
* not the underlying dataspaces, which were not created by this function.
*/
for (i = 0; i < num_spaces; i++) {
if (H5I_dec_app_ref(mem_space_ids[i]) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "problem freeing id")
if (H5I_dec_app_ref(file_space_ids[i]) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "problem freeing id")
if (NULL == H5I_remove(mem_space_ids[i]))
HDONE_ERROR(H5E_VFL, H5E_CANTREMOVE, FAIL, "problem removing id")
if (NULL == H5I_remove(file_space_ids[i]))
HDONE_ERROR(H5E_VFL, H5E_CANTREMOVE, FAIL, "problem removing id")
}
if (mem_space_ids != mem_space_ids_local)
mem_space_ids = H5MM_xfree(mem_space_ids);