nica/cairo_jpg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed memory leak in cairo_image_surface_create_from_jpeg_stream() (thanks to @xielei296)

Browse source
This commit is contained in:
rahra 2020-01-18 22:01:59 +01:00
parent ed065c6855
commit 2a0dff5ad3
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/cairo_jpg.c
View file

@ -35,7 +35,7 @@
* gcc -std=c99 -Wall -o cairo_jpg -DCAIRO_JPEG_MAIN `pkg-config cairo libjpeg --cflags --libs` cairo_jpg.c * gcc -std=c99 -Wall -o cairo_jpg -DCAIRO_JPEG_MAIN `pkg-config cairo libjpeg --cflags --libs` cairo_jpg.c
* *
* @author Bernhard R. Fischer, 4096R/8E24F29D bf@abenteuerland.at * @author Bernhard R. Fischer, 4096R/8E24F29D bf@abenteuerland.at
* @version 2018/12/11 * @version 2020/01/18
* @license LGPL3. * @license LGPL3.
*/ */
@ -380,7 +380,7 @@ cairo_surface_t *cairo_image_surface_create_from_jpeg_mem(void *data, size_t len
} }
/*! This function reads an JPEG image from a stream and creates a Cairo image /*! This function reads a JPEG image from a stream and creates a Cairo image
* surface. * surface.
* @param read_func Pointer to function which reads data. * @param read_func Pointer to function which reads data.
* @param closure Pointer which is passed to read_func(). * @param closure Pointer which is passed to read_func().
@ -397,6 +397,7 @@ cairo_surface_t *cairo_image_surface_create_from_jpeg_stream(cairo_read_func_len
cairo_surface_t *cairo_image_surface_create_from_jpeg_stream(cairo_read_func_t read_func, void *closure) cairo_surface_t *cairo_image_surface_create_from_jpeg_stream(cairo_read_func_t read_func, void *closure)
#endif #endif
{ {
cairo_surface_t *sfc;
void *data, *tmp; void *data, *tmp;
ssize_t len, rlen; ssize_t len, rlen;
int eof = 0; int eof = 0;
@ -434,7 +435,11 @@ cairo_surface_t *cairo_image_surface_create_from_jpeg_stream(cairo_read_func_t r
} }
// call jpeg decompression and return surface // call jpeg decompression and return surface
return cairo_image_surface_create_from_jpeg_mem(data, len); sfc = cairo_image_surface_create_from_jpeg_mem(data, len);
if (cairo_surface_status(sfc) != CAIRO_STATUS_SUCCESS)
free(data);
return sfc;
} }