Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dangling pointers causing erratic timer behaviour (affects taskbar with spacing); use calloc instead of malloc for safer initializations

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@758 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000
2015-04-17 20:17:25 +00:00
committed by mrovi9000@gmail.com
parent 778b9f0ebf
commit 66cae4bb7c
17 changed files with 135 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/taskbar/task.c
View File

@@ -87,7 +87,7 @@ Task *add_task (Window win)
if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
tskbar = &panel1[monitor].taskbar[j];
new_tsk2 = malloc(sizeof(Task));
new_tsk2 = calloc(1, sizeof(Task));
memcpy(&new_tsk2->area, &panel1[monitor].g_task.area, sizeof(Area));
new_tsk2->area.parent = tskbar;
new_tsk2->win = new_tsk.win;
@@ -115,7 +115,7 @@ Task *add_task (Window win)
g_ptr_array_add(task_group, new_tsk2);
//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
}
Window* key = malloc(sizeof(Window));
Window* key = calloc(1, sizeof(Window));
*key = new_tsk.win;
g_hash_table_insert(win_to_task_table, key, task_group);
set_task_state(new_tsk2, new_tsk.current_state);
@@ -195,14 +195,14 @@ int get_title(Task *tsk)
if (!name || !strlen(name)) {
name = server_get_property (tsk->win, server.atom.WM_NAME, XA_STRING, 0);
if (!name || !strlen(name)) {
name = malloc(10);
name = calloc(10, 1);
strcpy(name, "Untitled");
}
}
}
// add space before title
title = malloc(strlen(name)+2);
title = calloc(strlen(name)+2, 1);
if (panel->g_task.icon) strcpy(title, " ");
else title[0] = 0;
strcat(title, name);
@@ -620,7 +620,7 @@ void add_urgent(Task *tsk)
urgent_list = g_slist_prepend(urgent_list, tsk);
if (!urgent_timeout)
urgent_timeout = add_timeout(10, 1000, blink_urgent, 0);
urgent_timeout = add_timeout(10, 1000, blink_urgent, 0, &urgent_timeout);
Panel *panel = tsk->area.panel;
if (panel->is_hidden)

1
src/taskbar/taskbar.c
View File

@@ -109,7 +109,6 @@ void cleanup_taskbar()
urgent_list = NULL;
stop_timeout(urgent_timeout);
urgent_timeout = NULL;
}