summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-25 17:19:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-25 17:19:16 +0000
commitfb7f96fafa69f567ee23e3460a94ef575908cb52 (patch)
treed7817d3573cd4757b2d8d7929041e24d5fd176c0
parent6ebce39ae2fedc3bdf07ccf1dcd6a3a279d84938 (diff)
downloadruby-fb7f96fafa69f567ee23e3460a94ef575908cb52.tar.gz
ruby-fb7f96fafa69f567ee23e3460a94ef575908cb52.tar.xz
ruby-fb7f96fafa69f567ee23e3460a94ef575908cb52.zip
* process.c (rb_f_exec): get rid of SEGV when exec failed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--process.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a5f15c1a6..98853a4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 26 02:19:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * process.c (rb_f_exec): get rid of SEGV when exec failed.
+
Wed Feb 25 21:17:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (obj_free), io.c (rb_io_fptr_finalize), rubyio.h (OpenFile):
diff --git a/process.c b/process.c
index 18c46c265..cb201ebff 100644
--- a/process.c
+++ b/process.c
@@ -901,7 +901,7 @@ extern char *dln_find_exe();
static void
security(str)
- char *str;
+ const char *str;
{
if (rb_env_path_tainted()) {
if (rb_safe_level() > 0) {
@@ -913,7 +913,7 @@ security(str)
static int
proc_exec_v(argv, prog)
char **argv;
- char *prog;
+ const char *prog;
{
int err;
@@ -1232,7 +1232,7 @@ rb_f_exec(argc, argv)
e.argv = argv;
e.prog = prog ? RSTRING(prog)->ptr : 0;
rb_exec(&e);
- rb_sys_fail(RSTRING(argv[0])->ptr);
+ rb_sys_fail(e.prog);
return Qnil; /* dummy */
}