alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Check for NULL in container_update_title

Browse source 
Fixes crash when opening Firefox developer tools.
This commit is contained in:
Alex Xu (Hello71) 2018-05-04 11:10:01 -04:00
parent 029c9b1796
commit 3202c45054
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/tree/container.c
View file

@ -348,7 +348,7 @@ struct sway_container *container_view_create(struct sway_container *sibling,
swayc, title, sibling, sibling ? sibling->type : 0, sibling->name); swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
// Setup values // Setup values
swayc->sway_view = sway_view; swayc->sway_view = sway_view;
container_update_title(swayc, title ? title : ""); container_update_title(swayc, title);
swayc->width = 0; swayc->width = 0;
swayc->height = 0; swayc->height = 0;
@ -660,9 +660,14 @@ static void container_notify_child_title_changed(
void container_update_title(struct sway_container *container, void container_update_title(struct sway_container *container,
const char *new_title) { const char *new_title) {
if (!new_title) {
new_title = "";
}
if (container->name && strcmp(container->name, new_title) == 0) { if (container->name && strcmp(container->name, new_title) == 0) {
return; return;
} }
if (container->name) { if (container->name) {
free(container->name); free(container->name);
} }