aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:53:26 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-01-23 10:53:26 +0000
commitd4f30b24ad3fce33da3de7902c377df4d9988997 (patch)
treebc57c176e99bf217f4f17abe0b2c787346dd6c45
parent68e8bae442786715df4208d911f985f655f5d3f5 (diff)
downloadenlightenment-d4f30b24ad3fce33da3de7902c377df4d9988997.tar.gz
enlightenment-d4f30b24ad3fce33da3de7902c377df4d9988997.tar.xz
enlightenment-d4f30b24ad3fce33da3de7902c377df4d9988997.zip
fix possible null deref in e_sys when debugging
SVN revision: 83157
-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 3df041cbd..51c3753f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,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 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index b0ca10e0a..9ad87bb5f 100644
--- a/NEWS
+++ b/NEWS
@@ -119,3 +119,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 6b5aa8633..747836dca 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);