aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2018-06-30 11:18:42 +0900
committerDominique Martinet <asmadeus@codewreck.org>2018-06-30 20:46:58 +0900
commit0c2a64df18f8740ab795fb2970d1954a8aac34b1 (patch)
treee6626f03fdd94c7832c4b5cb3b97e2a61cf6602e /backend
parent1fef1f88b2c28777d559f7240aafe0dc078cf9e5 (diff)
headless add_input_device: fix leak on error
Found through static analysis
Diffstat (limited to 'backend')
-rw-r--r--backend/headless/input_device.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/backend/headless/input_device.c b/backend/headless/input_device.c
index a1e18428..63d28e8e 100644
--- a/backend/headless/input_device.c
+++ b/backend/headless/input_device.c
@@ -39,7 +39,7 @@ struct wlr_input_device *wlr_headless_add_input_device(
wlr_device->keyboard = calloc(1, sizeof(struct wlr_keyboard));
if (wlr_device->keyboard == NULL) {
wlr_log(L_ERROR, "Unable to allocate wlr_keyboard");
- return NULL;
+ goto error;
}
wlr_keyboard_init(wlr_device->keyboard, NULL);
break;
@@ -47,7 +47,7 @@ struct wlr_input_device *wlr_headless_add_input_device(
wlr_device->pointer = calloc(1, sizeof(struct wlr_pointer));
if (wlr_device->pointer == NULL) {
wlr_log(L_ERROR, "Unable to allocate wlr_pointer");
- return NULL;
+ goto error;
}
wlr_pointer_init(wlr_device->pointer, NULL);
break;
@@ -55,7 +55,7 @@ struct wlr_input_device *wlr_headless_add_input_device(
wlr_device->touch = calloc(1, sizeof(struct wlr_touch));
if (wlr_device->touch == NULL) {
wlr_log(L_ERROR, "Unable to allocate wlr_touch");
- return NULL;
+ goto error;
}
wlr_touch_init(wlr_device->touch, NULL);
break;
@@ -63,7 +63,7 @@ struct wlr_input_device *wlr_headless_add_input_device(
wlr_device->tablet_tool = calloc(1, sizeof(struct wlr_tablet_tool));
if (wlr_device->tablet_tool == NULL) {
wlr_log(L_ERROR, "Unable to allocate wlr_tablet_tool");
- return NULL;
+ goto error;
}
wlr_tablet_tool_init(wlr_device->tablet_tool, NULL);
break;
@@ -71,7 +71,7 @@ struct wlr_input_device *wlr_headless_add_input_device(
wlr_device->tablet_pad = calloc(1, sizeof(struct wlr_tablet_pad));
if (wlr_device->tablet_pad == NULL) {
wlr_log(L_ERROR, "Unable to allocate wlr_tablet_pad");
- return NULL;
+ goto error;
}
wlr_tablet_pad_init(wlr_device->tablet_pad, NULL);
break;
@@ -84,4 +84,7 @@ struct wlr_input_device *wlr_headless_add_input_device(
}
return wlr_device;
+error:
+ free(device);
+ return NULL;
}