aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:56:55 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:56:55 +0000
commit73743d1db73ea57257f902ca94779bb076378bd9 (patch)
treeffb060671bb7d08b88cca490f72eafb847f003f8
parent34e4de2fe8b11c7eed4b158fa6e8485ba431d554 (diff)
downloadenlightenment-73743d1db73ea57257f902ca94779bb076378bd9.tar.gz
enlightenment-73743d1db73ea57257f902ca94779bb076378bd9.tar.xz
enlightenment-73743d1db73ea57257f902ca94779bb076378bd9.zip
backport previous e_sys null deref fix
SVN revision: 83159
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_sys_main.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40047b2f8..27de5cc80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
* fixed small leak in illume2 policy config
* fixed path setting in import dialog
* fixed possible NULL deref in desktop editor
+ * fixed possible NULL deref in e_sys when debugging
2013-01-22 Massimo Maiurana
diff --git a/NEWS b/NEWS
index e1062d0e7..fe5304953 100644
--- a/NEWS
+++ b/NEWS
@@ -44,3 +44,4 @@ Fixes:
* fixed small leak in illume2 policy config
* fixed path setting in import dialog
* fixed possible NULL deref in desktop editor
+ * fixed possible NULL deref in e_sys when debugging
diff --git a/src/bin/e_sys_main.c b/src/bin/e_sys_main.c
index 579716e72..b5e412c35 100644
--- a/src/bin/e_sys_main.c
+++ b/src/bin/e_sys_main.c
@@ -167,7 +167,7 @@ main(int argc,
"-ex detach -ex quit > /dev/null 2> /dev/null",
cmd,
pid,
- output);
+ output ?: "e-output.txt");
r = system(buffer);