Skip to content

Free native resources on three rare decoder error paths #2587

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

Open
iurisilvio wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

Free native resources on three rare decoder error paths #2587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/CanvasRenderingContext2d.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,8 @@ create_transparent_pattern(cairo_pattern_t *source, float alpha) {
height);
cairo_t *mask_context = cairo_create(mask_surface);
if (cairo_status(mask_context) != CAIRO_STATUS_SUCCESS) {
cairo_destroy(mask_context);
cairo_surface_destroy(mask_surface);
return NULL;
}
cairo_set_source(mask_context, source);
Expand Down
11 changes: 10 additions & 1 deletion src/Image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ Image::loadGIFFromBuffer(uint8_t *buf, unsigned len) {

if (colormap == nullptr) {
GIF_CLOSE_FILE(gif);
delete[] data;
return CAIRO_STATUS_READ_ERROR;
}

Expand Down Expand Up @@ -1041,12 +1042,20 @@ Image::assignDataAsMime(uint8_t *data, int len, const char *mime_type) {

Napi::MemoryManagement::AdjustExternalMemory(env, len);

return cairo_surface_set_mime_data(_surface
cairo_status_t status = cairo_surface_set_mime_data(_surface
, mime_type
, mime_data
, len
, clearMimeData
, mime_closure);

if (status) {
Napi::MemoryManagement::AdjustExternalMemory(env, -len);
free(mime_data);
free(mime_closure);
}

return status;
}

/*
Expand Down