aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:00:09 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:00:09 +0000
commitb7d8881e1e59cf175ce481bd2ed49c8d158777a6 (patch)
treee8c7b5ff90a7f5b51a84b27273fbb2a4fcae9124
parentebe9fbd3bd9277d371f4191fd0544f017cb1fa9d (diff)
downloadenlightenment-b7d8881e1e59cf175ce481bd2ed49c8d158777a6.tar.gz
enlightenment-b7d8881e1e59cf175ce481bd2ed49c8d158777a6.tar.xz
enlightenment-b7d8881e1e59cf175ce481bd2ed49c8d158777a6.zip
backport previous import config dialog leak fix
SVN revision: 83138
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_import_config_dialog.c6
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 65d960478..7faca427d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* module error dialog is no longer remembered across restarts
* fix small leak in efm when performing dnd onto mounted drive icon
+ * fixed small leak in e_import_config_dialog_show during failure case
2013-01-22 Massimo Maiurana
diff --git a/NEWS b/NEWS
index f2cd86848..531635add 100644
--- a/NEWS
+++ b/NEWS
@@ -39,3 +39,4 @@ Fixes:
* fixed bug where "don't composite fullscreen windows" option would cause some windows to stop appearing
* module error dialog is no longer remembered across restarts
* fix small leak in efm when performing dnd onto mounted drive icon
+ * fixed small leak in e_import_config_dialog_show during failure case
diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c
index 4e7670ee1..0f7dfee59 100644
--- a/src/bin/e_import_config_dialog.c
+++ b/src/bin/e_import_config_dialog.c
@@ -449,7 +449,11 @@ e_import_config_dialog_show(E_Container *con, const char *path, Ecore_End_Cb ok,
if (!import) return NULL;
dia = e_dialog_new(con, "E", "_import_config_dialog");
- if (!dia) return NULL;
+ if (!dia)
+ {
+ e_object_del(E_OBJECT(import));
+ return NULL;
+ }
e_dialog_resizable_set(dia, 1);
e_dialog_title_set(dia, _("Import Settings..."));