Skip to content

Unlock write context in exr_get_chunk_table_offset() return paths #2472

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

Merged
cary-ilm merged 2 commits into from
Jun 17, 2026
+14 −2
Merged

Unlock write context in exr_get_chunk_table_offset() return paths #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e5f13e
Unlock write context in exr_get_chunk_table_offset() return paths
cary-ilm Jun 12, 2026
ebed35b
Merge branch 'main' into GHSA-9pfw-x4vc-xqx7
cary-ilm Jun 17, 2026
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
5 changes: 3 additions & 2 deletions src/lib/OpenEXRCore/chunk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,10 +516,11 @@ exr_get_chunk_table_offset (
EXR_LOCK_WRITE_AND_DEFINE_PART (part_index);

if (!chunk_offset_out)
return ctxt->standard_error (ctxt, EXR_ERR_INVALID_ARGUMENT);
return EXR_UNLOCK_WRITE_AND_RETURN (
ctxt->standard_error (ctxt, EXR_ERR_INVALID_ARGUMENT));

*chunk_offset_out = part->chunk_table_offset;
return EXR_ERR_SUCCESS;
return EXR_UNLOCK_WRITE_AND_RETURN (EXR_ERR_SUCCESS);
}

exr_result_t
Expand Down
11 changes: 11 additions & 0 deletions src/test/OpenEXRCoreTest/write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,17 @@ testStartWriteScan (const std::string& tempdir)
EXRCORE_TEST_RVAL (
exr_add_part (outf, "beauty", EXR_STORAGE_SCANLINE, &partidx));
EXRCORE_TEST (partidx == 0);
{
uint64_t chunk_table_offset = 0;
int count = 0;
EXRCORE_TEST_RVAL (
exr_get_chunk_table_offset (outf, 0, &chunk_table_offset));
EXRCORE_TEST_RVAL_FAIL (
EXR_ERR_INVALID_ARGUMENT,
exr_get_chunk_table_offset (outf, 0, NULL));
EXRCORE_TEST_RVAL (exr_get_count (outf, &count));
EXRCORE_TEST (count == 1);
}
/* dup name check */
EXRCORE_TEST_RVAL_FAIL (
EXR_ERR_INVALID_ARGUMENT,
Expand Down
Loading