yugui	2010-12-08 17:09:44 +0900 (Wed, 08 Dec 2010)

  New Revision: 30140

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

  Log:
    merges r29798 from trunk into ruby_1_9_2.
    --
    * vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
      Scan found this bug.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vm_eval.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30139)
+++ ruby_1_9_2/ChangeLog	(revision 30140)
@@ -1,3 +1,8 @@
+Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@t...>
+
+	* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
+	  Scan found this bug.
+
 Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@t...>
 
 	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
Index: ruby_1_9_2/vm_eval.c
===================================================================
--- ruby_1_9_2/vm_eval.c	(revision 30139)
+++ ruby_1_9_2/vm_eval.c	(revision 30140)
@@ -619,11 +619,12 @@
 {
     VALUE *argv;
     va_list ar;
-    va_init_list(ar, n);
 
     if (n > 0) {
 	long i;
 
+	va_init_list(ar, n);
+
 	argv = ALLOCA_N(VALUE, n);
 
 	for (i = 0; i < n; i++) {
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30139)
+++ ruby_1_9_2/version.h	(revision 30140)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 93
+#define RUBY_PATCHLEVEL 94
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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