Merge lp:~a-j-buxton/lightdm-gtk-greeter/clockleak into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Alistair Buxton
Status: Merged
Merged at revision: 175
Proposed branch: lp:~a-j-buxton/lightdm-gtk-greeter/clockleak
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 20 lines (+4/-1)
1 file modified
src/lightdm-gtk-greeter.c (+4/-1)
To merge this branch: bzr merge lp:~a-j-buxton/lightdm-gtk-greeter/clockleak
Reviewer Review Type Date Requested Status
LightDM Gtk+ Greeter Development Team Pending
Review via email: mp+201074@code.launchpad.net

Commit message

Fix a memory leak in the clock timeout function.

Description of the change

The clock timeout function updates the label with the current time. The temporary string used to hold the time and markup should be freed after setting the label.

Fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734526

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lightdm-gtk-greeter.c'
2--- src/lightdm-gtk-greeter.c 2014-01-09 02:35:27 +0000
3+++ src/lightdm-gtk-greeter.c 2014-01-09 18:47:46 +0000
4@@ -1732,12 +1732,15 @@
5 time_t rawtime;
6 struct tm * timeinfo;
7 gchar time_str[50];
8+ gchar *markup;
9
10 time ( &rawtime );
11 timeinfo = localtime ( &rawtime );
12
13 strftime(time_str, 50, clock_format, timeinfo);
14- gtk_label_set_markup( GTK_LABEL(clock_label), g_strdup_printf("<b>%s</b>", time_str) );
15+ markup = g_markup_printf_escaped("<b>%s</b>", time_str);
16+ gtk_label_set_markup( GTK_LABEL(clock_label), markup );
17+ g_free(markup);
18
19 return TRUE;
20 }

Subscribers

People subscribed via source and target branches