mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 13:41:07 +00:00
gdk: Fix possible memory errors
clang complained that we may end up jumping to the cleanup code without initializing data in the jpeg code. Always initialize data to NULL to prevent that eventuality.
This commit is contained in:
parent
95fc5109bb
commit
8c1a041104
@ -141,7 +141,7 @@ gdk_load_jpeg (GBytes *input_bytes,
|
||||
struct jpeg_decompress_struct info;
|
||||
struct error_handler_data jerr;
|
||||
guint width, height, stride;
|
||||
unsigned char *data;
|
||||
unsigned char *data = NULL;
|
||||
unsigned char *row[1];
|
||||
GBytes *bytes;
|
||||
GdkTexture *texture;
|
||||
@ -155,6 +155,7 @@ gdk_load_jpeg (GBytes *input_bytes,
|
||||
|
||||
if (sigsetjmp (jerr.setjmp_buffer, 1))
|
||||
{
|
||||
g_free (data);
|
||||
jpeg_destroy_decompress (&info);
|
||||
return NULL;
|
||||
}
|
||||
@ -247,7 +248,7 @@ gdk_save_jpeg (GdkTexture *texture)
|
||||
struct jpeg_compress_struct info;
|
||||
struct error_handler_data jerr;
|
||||
struct jpeg_error_mgr err;
|
||||
guchar *data;
|
||||
guchar *data = NULL;
|
||||
gulong size = 0;
|
||||
guchar *input = NULL;
|
||||
GdkMemoryTexture *memtex = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user