backport previous desktop editor commit

SVN revision: 83156
This commit is contained in:
Mike Blumenkrantz 2013-01-23 10:50:42 +00:00
parent c7deb20915
commit 34e4de2fe8
3 changed files with 3 additions and 1 deletions

View File

@ -6,6 +6,7 @@
* fixed small leak in e_import_dialog_show during failure case
* fixed small leak in illume2 policy config
* fixed path setting in import dialog
* fixed possible NULL deref in desktop editor
2013-01-22 Massimo Maiurana

1
NEWS
View File

@ -43,3 +43,4 @@ Fixes:
* fixed small leak in e_import_dialog_show during failure case
* fixed small leak in illume2 policy config
* fixed path setting in import dialog
* fixed possible NULL deref in desktop editor

View File

@ -143,7 +143,7 @@ e_desktop_border_create(E_Border *bd)
*/
char file[PATH_MAX];
snprintf(file, sizeof(file), "%s-%.6f.png", bname, ecore_time_get());
snprintf(file, sizeof(file), "%s-%.6f.png", bname ?: "", ecore_time_get());
snprintf(path, sizeof(path), "%s/%s", icon_dir, file);
if (e_util_icon_save(&(bd->client.netwm.icons[0]), path))
desktop->icon = strdup(file);