[前][次][番号順一覧][スレッド一覧]

ruby-changes:18639

From: nobu <ko1@a...>
Date: Thu, 27 Jan 2011 12:46:54 +0900 (JST)
Subject: [ruby-changes:18639] Ruby:r30663 (trunk): * process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.

nobu	2011-01-27 12:46:44 +0900 (Thu, 27 Jan 2011)

  New Revision: 30663

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

  Log:
    * process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.

  Modified files:
    trunk/ChangeLog
    trunk/process.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30662)
+++ ChangeLog	(revision 30663)
@@ -1,3 +1,7 @@
+Thu Jan 27 12:46:25 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.
+
 Thu Jan 27 08:41:40 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* process.c (proc_exec_v, rb_proc_exec_n, rb_proc_exec)
Index: process.c
===================================================================
--- process.c	(revision 30662)
+++ process.c	(revision 30663)
@@ -1035,7 +1035,7 @@
 #define ARGV_SIZE(n) (sizeof(char*) * ARGV_COUNT(n))
 #define ALLOC_ARGV(n, v) ALLOCV_N(char*, (v), ARGV_COUNT(n))
 #define ALLOC_ARGV_WITH_STR(n, v, s, l) \
-    (char **)(((s) = ALLOCV((v), ARGV_SIZE(n) + (l)) + ARGV_SIZE(n)) - ARGV_SIZE(n))
+    (char **)(((s) = ALLOCV_N(char, (v), ARGV_SIZE(n) + (l)) + ARGV_SIZE(n)) - ARGV_SIZE(n))
 
 static int
 proc_exec_v(char **argv, const char *prog)

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

[前][次][番号順一覧][スレッド一覧]