summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 13:59:10 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 13:59:10 +0000
commit4973c1e41c09d5110cceaa08006f1abd1109ce67 (patch)
tree9a72ae3b31f1783d8102997dd85466556e0910cf
parenta65c967980292003dfeb9275ecb1baf41ae13894 (diff)
downloadruby-4973c1e41c09d5110cceaa08006f1abd1109ce67.tar.gz
ruby-4973c1e41c09d5110cceaa08006f1abd1109ce67.tar.xz
ruby-4973c1e41c09d5110cceaa08006f1abd1109ce67.zip
* process.c (rb_fork): don't propagete an error message if error
buffer not given. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--process.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e906c6310..715bb07e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 23 22:57:48 2008 Tanaka Akira <akr@fsij.org>
+
+ * process.c (rb_fork): don't propagete an error message if error
+ buffer not given.
+
Tue Dec 23 21:55:05 2008 Tanaka Akira <akr@fsij.org>
* process.c (rb_fork): propagete an error message from child to parent.
diff --git a/process.c b/process.c
index 51683de2f..cfc2e8d5f 100644
--- a/process.c
+++ b/process.c
@@ -2477,8 +2477,10 @@ rb_fork(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fd
#ifdef FD_CLOEXEC
err = errno;
write(ep[1], &err, sizeof(err));
- errmsg[errmsg_buflen-1] = '\0';
- write(ep[1], errmsg, strlen(errmsg));
+ if (errmsg && 0 < errmsg_buflen) {
+ errmsg[errmsg_buflen-1] = '\0';
+ write(ep[1], errmsg, strlen(errmsg));
+ }
#endif
#if EXIT_SUCCESS == 127
_exit(EXIT_FAILURE);