mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: free memory on move/resize error paths

Browse Source 
Memory leaks noticed by Valgrind, when wl_input_device_update_grab()
fails.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
dev
Pekka Paalanen 13 years ago
parent 8600040236
commit 61b5c67268
1 changed files with 9 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      src/shell.c

12
src/shell.c
Unescape View File

@ -170,8 +170,10 @@ weston_surface_move(struct weston_surface *es,
move->surface = es; move->surface = es;
if (wl_input_device_update_grab(&wd->input_device, if (wl_input_device_update_grab(&wd->input_device,
&move->grab, &es->surface, time) < 0) &move->grab, &es->surface, time) < 0) {
free(move);
return 0; return 0;
}
wl_input_device_set_pointer_focus(&wd->input_device, wl_input_device_set_pointer_focus(&wd->input_device,
NULL, time, 0, 0, 0, 0); NULL, time, 0, 0, 0, 0);
@ -268,16 +270,20 @@ weston_surface_resize(struct shell_surface *shsurf,
if (edges == 0 || edges > 15 || if (edges == 0 || edges > 15 ||
(edges & 3) == 3 || (edges & 12) == 12) (edges & 3) == 3 || (edges & 12) == 12)
return 0; goto err_out;
if (wl_input_device_update_grab(&wd->input_device, if (wl_input_device_update_grab(&wd->input_device,
&resize->grab, &es->surface, time) < 0) &resize->grab, &es->surface, time) < 0)
return 0; goto err_out;
wl_input_device_set_pointer_focus(&wd->input_device, wl_input_device_set_pointer_focus(&wd->input_device,
NULL, time, 0, 0, 0, 0); NULL, time, 0, 0, 0, 0);
return 0; return 0;
err_out:
free(resize);
return 0;
} }
static void static void

Write Preview
Loading…
Cancel
Save