Skip to content

Catch potential memory corruption in applyGainmap() call #367

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Catch potential memory corruption in applyGainmap() call #367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db6c31
Catch potential memory corruption in applyGainmap() call
DichenZhang1 Aug 30, 2025
498eead
Update jpegr.cpp
DichenZhang1 Aug 30, 2025
54e8d12
Update jpegr.cpp
DichenZhang1 Aug 30, 2025
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
13 changes: 11 additions & 2 deletions lib/src/jpegr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <deque>
#include <functional>
#include <mutex>
#include <stdexcept>
#include <thread>

#include "ultrahdr/editorhelper.h"
Expand Down Expand Up @@ -1444,8 +1445,16 @@ uhdr_error_info_t JpegR::decodeJPEGR(uhdr_compressed_image_t* uhdr_compressed_im
return g_no_error;
}

UHDR_ERR_CHECK(applyGainMap(&sdr_intent, &gainmap, &uhdr_metadata, output_ct, output_format,
max_display_boost, dest));
try {
UHDR_ERR_CHECK(applyGainMap(&sdr_intent, &gainmap, &uhdr_metadata, output_ct, output_format,
max_display_boost, dest));
} catch (const std::out_of_range& e) {
uhdr_error_info_t status;
status.error_code = UHDR_CODEC_MEM_ERROR;
status.has_detail = 1;
snprintf(status.detail, sizeof status.detail, "The output buffer size is too small: %s", e.what());
return status;
}

return g_no_error;
}
Expand Down
Loading