Skip to content

Release RsvgHandle and partial surface on SVG decode error paths #2585

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
+21 −6
Open

Release RsvgHandle and partial surface on SVG decode error paths #2585

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
27 changes: 21 additions & 6 deletions src/Image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ cairo_surface_t *Image::surface() {

cairo_status_t status = renderSVGToSurface();
if (status != CAIRO_STATUS_SUCCESS) {
g_object_unref(_rsvg);
Napi::Error::New(env, cairo_status_to_string(status)).ThrowAsJavaScriptException();

return NULL;
Expand Down Expand Up @@ -1473,16 +1472,19 @@ Image::loadSVGFromBuffer(uint8_t *buf, unsigned len) {
return CAIRO_STATUS_READ_ERROR;
}

double d_width;
double d_height;
double d_width = 0;
double d_height = 0;

rsvg_handle_get_intrinsic_size_in_pixels(_rsvg, &d_width, &d_height);
gboolean has_size = rsvg_handle_get_intrinsic_size_in_pixels(_rsvg, &d_width, &d_height);

width = naturalWidth = d_width;
height = naturalHeight = d_height;
width = naturalWidth = has_size ? d_width : 0;
height = naturalHeight = has_size ? d_height : 0;

if (width <= 0 || height <= 0) {
this->errorInfo.set("Width and height must be set on the svg element");
g_object_unref(_rsvg);
_rsvg = NULL;
_is_svg = false;
return CAIRO_STATUS_READ_ERROR;
}

Expand All @@ -1501,13 +1503,22 @@ Image::renderSVGToSurface() {
status = cairo_surface_status(_surface);
if (status != CAIRO_STATUS_SUCCESS) {
g_object_unref(_rsvg);
_rsvg = NULL;
cairo_surface_destroy(_surface);
_surface = NULL;
_is_svg = false;
return status;
}

cairo_t *cr = cairo_create(_surface);
status = cairo_status(cr);
if (status != CAIRO_STATUS_SUCCESS) {
g_object_unref(_rsvg);
_rsvg = NULL;
cairo_destroy(cr);
cairo_surface_destroy(_surface);
_surface = NULL;
_is_svg = false;
return status;
}

Expand All @@ -1520,7 +1531,11 @@ Image::renderSVGToSurface() {
gboolean render_ok = rsvg_handle_render_document(_rsvg, cr, &viewport, nullptr);
if (!render_ok) {
g_object_unref(_rsvg);
_rsvg = NULL;
cairo_destroy(cr);
cairo_surface_destroy(_surface);
_surface = NULL;
_is_svg = false;
return CAIRO_STATUS_READ_ERROR; // or WRITE?
}

Expand Down