Skip to content

Track data and src on canvas_jpeg_error_mgr to free on libjpeg longjmp #2581

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
+25 −8
Open

Track data and src on canvas_jpeg_error_mgr to free on libjpeg longjmp #2581

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
33 changes: 25 additions & 8 deletions src/Image.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ typedef struct {

struct canvas_jpeg_error_mgr: jpeg_error_mgr {
Image* image;
uint8_t* data = nullptr;
uint8_t* src = nullptr;
jmp_buf setjmp_buffer;
};
#endif
Expand Down Expand Up @@ -830,6 +832,7 @@ cairo_status_t
Image::decodeJPEGIntoSurface(jpeg_decompress_struct *args, Orientation orientation) {
const int channels = 4;
cairo_status_t status = CAIRO_STATUS_SUCCESS;
canvas_jpeg_error_mgr *err = static_cast<canvas_jpeg_error_mgr*>(args->err);

uint8_t *data = new uint8_t[naturalWidth * naturalHeight * channels];
if (!data) {
Expand All @@ -838,15 +841,18 @@ Image::decodeJPEGIntoSurface(jpeg_decompress_struct *args, Orientation orientati
this->errorInfo.set(NULL, "malloc", errno);
return CAIRO_STATUS_NO_MEMORY;
}
err->data = data;

uint8_t *src = new uint8_t[naturalWidth * args->output_components];
if (!src) {
err->data = nullptr;
free(data);
jpeg_abort_decompress(args);
jpeg_destroy_decompress(args);
this->errorInfo.set(NULL, "malloc", errno);
return CAIRO_STATUS_NO_MEMORY;
}
err->src = src;

// These are the three main cases to handle. libjpeg converts YCCK to CMYK
// and YCbCr to RGB by default.
Expand Down Expand Up @@ -880,29 +886,36 @@ Image::decodeJPEGIntoSurface(jpeg_decompress_struct *args, Orientation orientati

updateDimensionsForOrientation(orientation);

if (status) {
jpeg_abort_decompress(args);
} else {
jpeg_finish_decompress(args);
}
jpeg_destroy_decompress(args);

delete[] src;
err->src = nullptr;

if (!status) {
_surface = cairo_image_surface_create_for_data(
data
, CAIRO_FORMAT_ARGB32
, naturalWidth
, naturalHeight
, cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, naturalWidth));
status = cairo_surface_status(_surface);
}

jpeg_finish_decompress(args);
jpeg_destroy_decompress(args);
status = cairo_surface_status(_surface);

rotatePixels(data, naturalWidth, naturalHeight, channels, orientation);

delete[] src;

if (status) {
delete[] data;
err->data = nullptr;
return status;
}

rotatePixels(data, naturalWidth, naturalHeight, channels, orientation);

_data = data;
err->data = nullptr;

return CAIRO_STATUS_SUCCESS;
}
Expand All @@ -914,6 +927,10 @@ Image::decodeJPEGIntoSurface(jpeg_decompress_struct *args, Orientation orientati
static void canvas_jpeg_error_exit(j_common_ptr cinfo) {
canvas_jpeg_error_mgr *cjerr = static_cast<canvas_jpeg_error_mgr*>(cinfo->err);
cjerr->output_message(cinfo);
delete[] cjerr->data;
delete[] cjerr->src;
cjerr->data = nullptr;
cjerr->src = nullptr;
// Return control to the setjmp point
longjmp(cjerr->setjmp_buffer, 1);
}
Expand Down