blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1307 from emersion/static-analysis 

Fix a few bugs found by the static analyzer
This commit is contained in:
Drew DeVault 2018-10-21 19:18:39 +02:00 committed by GitHub
parent be6210cf82 a9e02a9ea6
commit e0cf97da69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/backend.c
View File

@ -217,16 +217,16 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
backend, &multi->session, name, create_renderer_func);
if (subbackend == NULL) {
wlr_log(WLR_ERROR, "failed to start backend '%s'", name);
wlr_backend_destroy(backend);
wlr_session_destroy(multi->session);
wlr_backend_destroy(backend);
free(names);
return NULL;
}
if (!wlr_multi_backend_add(backend, subbackend)) {
wlr_log(WLR_ERROR, "failed to add backend '%s'", name);
wlr_backend_destroy(backend);
wlr_session_destroy(multi->session);
wlr_backend_destroy(backend);
free(names);
return NULL;
}
@ -272,8 +272,8 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
multi->session);
if (!libinput) {
wlr_log(WLR_ERROR, "Failed to start libinput backend");
wlr_backend_destroy(backend);
wlr_session_destroy(multi->session);
wlr_backend_destroy(backend);
return NULL;
}
wlr_multi_backend_add(backend, libinput);
@ -283,8 +283,8 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
if (!primary_drm) {
wlr_log(WLR_ERROR, "Failed to open any DRM device");
wlr_backend_destroy(libinput);
wlr_backend_destroy(backend);
wlr_session_destroy(multi->session);
wlr_backend_destroy(backend);
return NULL;
}

23
types/tablet_v2/wlr_tablet_v2_pad.c
View File

@ -188,10 +188,9 @@ static void add_tablet_pad_group(struct wlr_tablet_v2_tablet_pad *pad,
struct wlr_tablet_pad_client_v2 *client,
struct wlr_tablet_pad_group *group, size_t index) {
int version = wl_resource_get_version(client->resource);
client->groups[index] =
wl_resource_create(client->client, &zwp_tablet_pad_group_v2_interface,
version, 0);
uint32_t version = wl_resource_get_version(client->resource);
client->groups[index] = wl_resource_create(client->client,
&zwp_tablet_pad_group_v2_interface, version, 0);
if (!client->groups[index]) {
wl_client_post_no_memory(client->client);
return;
@ -228,15 +227,17 @@ static void add_tablet_pad_group(struct wlr_tablet_v2_tablet_pad *pad,
}
user_data->pad = client;
user_data->index = strip;
client->strips[strip] =
wl_resource_create(client->client, &zwp_tablet_pad_strip_v2_interface, 1, 0);
client->strips[strip] = wl_resource_create(client->client,
&zwp_tablet_pad_strip_v2_interface, version, 0);
if (!client->strips[strip]) {
free(user_data);
wl_client_post_no_memory(client->client);
return;
}
wl_resource_set_implementation(client->strips[strip],
&tablet_pad_strip_impl, user_data, destroy_tablet_pad_strip_v2);
zwp_tablet_pad_group_v2_send_strip(client->groups[index], client->strips[strip]);
zwp_tablet_pad_group_v2_send_strip(client->groups[index],
client->strips[strip]);
}
client->ring_count = group->ring_count;
@ -250,15 +251,17 @@ static void add_tablet_pad_group(struct wlr_tablet_v2_tablet_pad *pad,
}
user_data->pad = client;
user_data->index = ring;
client->rings[ring] =
wl_resource_create(client->client, &zwp_tablet_pad_ring_v2_interface, 1, 0);
client->rings[ring] = wl_resource_create(client->client,
&zwp_tablet_pad_ring_v2_interface, version, 0);
if (!client->rings[ring]) {
free(user_data);
wl_client_post_no_memory(client->client);
return;
}
wl_resource_set_implementation(client->rings[ring],
&tablet_pad_ring_impl, user_data, destroy_tablet_pad_ring_v2);
zwp_tablet_pad_group_v2_send_ring(client->groups[index], client->rings[ring]);
zwp_tablet_pad_group_v2_send_ring(client->groups[index],
client->rings[ring]);
}
zwp_tablet_pad_group_v2_send_done(client->groups[index]);