aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:50:42 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:50:42 +0000
commit34e4de2fe8b11c7eed4b158fa6e8485ba431d554 (patch)
tree22578afe353dedaf1363d2753acbd5e60cd9e924
parentc7deb20915e363ba31865d714859189b50c53b35 (diff)
downloadenlightenment-34e4de2fe8b11c7eed4b158fa6e8485ba431d554.tar.gz
enlightenment-34e4de2fe8b11c7eed4b158fa6e8485ba431d554.tar.xz
enlightenment-34e4de2fe8b11c7eed4b158fa6e8485ba431d554.zip
backport previous desktop editor commit
SVN revision: 83156
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_eap_editor.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a6f237970..40047b2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/NEWS b/NEWS
index 1105deaa8..e1062d0e7 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index 3ea3ac901..f003511e2 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -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);