Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix memory bug in selection I/O #2096

Merged
merged 2 commits into from
Sep 14, 2022
Merged

Fix memory bug in selection I/O #2096

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc7ea57
Fix memory bug in selection I/O
fortnern Sep 12, 2022
dc1a884
Change error messages for calls to H5I_remove() in
fortnern Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions src/H5FDint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down Expand Up @@ -1200,12 +1200,14 @@ H5FD_read_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_s
}
}

/* 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);
Expand Down Expand Up @@ -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")
}
}
Expand Down Expand Up @@ -1835,12 +1837,14 @@ H5FD_write_selection(H5FD_t *file, H5FD_mem_t type, uint32_t count, H5S_t **mem_
}
}

/* 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);
Expand Down