Skip to content

Fix dangling env pointer in image MIME data cleanup #2551

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
chearon merged 2 commits into from
Feb 4, 2026
+5 −7
Merged

Fix dangling env pointer in image MIME data cleanup #2551

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
0b0afb3
Copy NAPI env instead of referencing member
kayahr Feb 4, 2026
a3095b8
Add changelog entry
kayahr Feb 4, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
### Changed
### Added
### Fixed
* Fix dangling env pointer in image MIME data cleanup (#2550)

3.2.1
==================
Expand Down
11 changes: 4 additions & 7 deletions src/Image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct canvas_jpeg_error_mgr: jpeg_error_mgr {
*/

typedef struct {
Napi::Env* env;
Napi::Env env;
unsigned len;
uint8_t *buf;
} read_closure_t;
Expand Down Expand Up @@ -335,10 +335,7 @@ Image::loadFromBuffer(uint8_t *buf, unsigned len) {

cairo_status_t
Image::loadPNGFromBuffer(uint8_t *buf) {
read_closure_t closure;
closure.len = 0;
closure.buf = buf;
closure.env = &env;
read_closure_t closure{ env, 0, buf };
_surface = cairo_image_surface_create_from_png_stream(readPNG, &closure);
cairo_status_t status = cairo_surface_status(_surface);
if (status) return status;
Expand Down Expand Up @@ -1007,7 +1004,7 @@ Image::decodeJPEGBufferIntoMimeSurface(uint8_t *buf, unsigned len) {
void
clearMimeData(void *closure) {
Napi::MemoryManagement::AdjustExternalMemory(
*static_cast<read_closure_t *>(closure)->env,
static_cast<read_closure_t *>(closure)->env,
-static_cast<int>((static_cast<read_closure_t *>(closure)->len)));
free(static_cast<read_closure_t *>(closure)->buf);
free(closure);
Expand Down Expand Up @@ -1036,7 +1033,7 @@ Image::assignDataAsMime(uint8_t *data, int len, const char *mime_type) {

memcpy(mime_data, data, len);

mime_closure->env = &env;
mime_closure->env = env;
mime_closure->buf = mime_data;
mime_closure->len = len;

Expand Down
Loading