akr	2012-06-04 20:01:41 +0900 (Mon, 04 Jun 2012)

  New Revision: 35910

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35910

  Log:
    * process.c (rb_exec_fillarg): allocate one more element before
      beginning in argv_str for try_with_sh.
    
    * internal.h (ARGVSTR2ARGC): adjust for the above change.
      (ARGVSTR2ARGV): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/internal.h
    trunk/process.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35909)
+++ ChangeLog	(revision 35910)
@@ -1,3 +1,11 @@
+Mon Jun  4 19:36:25 2012  Tanaka Akira  <akr@f...>
+
+	* process.c (rb_exec_fillarg): allocate one more element before
+	  beginning in argv_str for try_with_sh.
+
+	* internal.h (ARGVSTR2ARGC): adjust for the above change.
+	  (ARGVSTR2ARGV): ditto.
+
 Mon Jun  4 19:17:06 2012  Tanaka Akira  <akr@f...>
 
 	* internal.h (ARGVSTR2ARGC): defined.
Index: process.c
===================================================================
--- process.c	(revision 35909)
+++ process.c	(revision 35910)
@@ -1843,17 +1843,17 @@
     }
 
     if (e->argv_buf) {
-        char *p, *ep;
+        char *p, *ep, *null=NULL;
         VALUE argv_str;
-        argv_str = hide_obj(rb_str_buf_new(sizeof(char*) * (argc + 1)));
+        argv_str = hide_obj(rb_str_buf_new(sizeof(char*) * (argc + 2)));
+        rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* place holder for /bin/sh of try_with_sh. */
         p = RSTRING_PTR(e->argv_buf);
         ep = p + RSTRING_LEN(e->argv_buf);
         while (p < ep) {
             rb_str_buf_cat(argv_str, (char *)&p, sizeof(p));
             p += strlen(p) + 1;
         }
-        p = NULL;
-        rb_str_buf_cat(argv_str, (char *)&p, sizeof(p));
+        rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* terminator for execve.  */
         e->argv_str = argv_str;
     }
 }
Index: internal.h
===================================================================
--- internal.h	(revision 35909)
+++ internal.h	(revision 35910)
@@ -159,10 +159,12 @@
 
 /* process.c */
 
-/* argv_str contains an extra element for terminating NULL used by execve..
+/* argv_str contains extra two elements.
+ * The beginning one is for /bin/sh used by exec_with_sh.
+ * The last one for terminating NULL used by execve.
  * See rb_exec_fillarg() in process.c. */
-#define ARGVSTR2ARGC(argv_str) (RSTRING_LEN(argv_str) / sizeof(char *) - 1)
-#define ARGVSTR2ARGV(argv_str) ((char **)RSTRING_PTR(argv_str))
+#define ARGVSTR2ARGC(argv_str) (RSTRING_LEN(argv_str) / sizeof(char *) - 2)
+#define ARGVSTR2ARGV(argv_str) ((char **)RSTRING_PTR(argv_str) + 1)
 
 /* rational.c */
 VALUE rb_lcm(VALUE x, VALUE y);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/