diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ruby.c | 15 |
2 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Fri Nov 9 10:05:54 2007 Koichi Sasada <ko1@atdot.net> + + * ruby.c (set_arg0): fix breaking environ bugs. + Fri Nov 9 07:26:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * random.c: update MT URL.[ruby-core:13305]. @@ -1173,7 +1173,7 @@ get_arglen(int argc, char **argv) static void set_arg0(VALUE val, ID id) { - char *s; + char *s, *t; long i; if (origarg.argv == 0) @@ -1204,13 +1204,16 @@ set_arg0(VALUE val, ID id) } memcpy(origarg.argv[0], s, i); - s = origarg.argv[0] + i; - *s = '\0'; - if (i + 1 < origarg.len) memset(s + 1, ' ', origarg.len - i - 1); + t = origarg.argv[0] + i; + *t = '\0'; + + if (i + 1 < origarg.len) memset(t + 1, ' ', origarg.len - i - 1); + { int j; - for (j = 1; j < origarg.argc; j++) - origarg.argv[i] = s; + for (j = 1; j < origarg.argc; j++) { + origarg.argv[j] = t; + } } #endif rb_progname = rb_tainted_str_new(s, i); |