AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Don't leak cursor structs

Browse Source 
Found by gcc's -fanalyzer.
This commit is contained in:
Matthias Clasen 2023-05-31 20:34:28 -04:00
parent 7ae7356284
commit 85bafbdff0
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gdk/wayland/cursor/wayland-cursor.c
View File

@ -207,7 +207,7 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
{
char *path;
XcursorImages *images;
struct cursor *cursor;
struct wl_cursor *cursor;
struct cursor_image *image;
int i, nbytes;
unsigned int load_size;
@ -240,17 +240,16 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
return NULL;
}
cursor->cursor.images =
malloc(images->nimage * sizeof cursor->cursor.images[0]);
if (!cursor->cursor.images) {
cursor->images =
malloc(images->nimage * sizeof cursor->images[0]);
if (!cursor->images) {
free(cursor);
xcursor_images_destroy (images);
return NULL;
}
cursor->cursor.name = strdup(name);
cursor->cursor.size = load_size;
cursor->total_delay = 0;
cursor->name = strdup(name);
cursor->size = load_size;
for (i = 0; i < images->nimage; i++) {
image = malloc(sizeof *image);
@ -291,14 +290,13 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
}
}
}
cursor->total_delay += image->image.delay;
cursor->cursor.images[i] = (struct wl_cursor_image *) image;
cursor->images[i] = (struct wl_cursor_image *) image;
}
cursor->cursor.image_count = i;
cursor->image_count = i;
if (cursor->cursor.image_count == 0) {
free(cursor->cursor.name);
free(cursor->cursor.images);
if (cursor->image_count == 0) {
free(cursor->name);
free(cursor->images);
free(cursor);
xcursor_images_destroy (images);
return NULL;
@ -306,7 +304,7 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
xcursor_images_destroy (images);
return &cursor->cursor;
return cursor;
}
static void