2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ad1394dfa..788daa8429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
+
+	* process.c (rb_f_system): move signal right before fork to avoid
+	  signal handler intervention.
+
 Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
 
 	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
diff --git a/process.c b/process.c
index 4271c2ff1b..76720977c8 100644
--- a/process.c
+++ b/process.c
@@ -1494,7 +1494,6 @@ rb_f_system(argc, argv)
     int i;
     RETSIGTYPE (*chfunc)(int);
 
-    chfunc = signal(SIGCHLD, SIG_DFL);
     fflush(stdout);
     fflush(stderr);
     if (argc == 0) {
@@ -1516,6 +1515,8 @@ rb_f_system(argc, argv)
     for (i = 0; i < argc; i++) {
 	SafeStringValue(argv[i]);
     }
+    security(RSTRING(prog ? prog : argv[0])->ptr);
+    chfunc = signal(SIGCHLD, SIG_DFL);
   retry:
     pid = fork();
     if (pid == 0) {