From c9116c68f404457d23be77ab7c57bb1ffb269e2e Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 8 Dec 2010 08:09:44 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 version.h | 2 +-
 vm_eval.c | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94fab3e330..8d1098df35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* 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@tenderlovemaking.com>
 
 	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
diff --git a/version.h b/version.h
index c4c11a8070..ea2c08222a 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/vm_eval.c b/vm_eval.c
index 14da1fe5b4..b0718ab5f3 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -619,11 +619,12 @@ rb_funcall(VALUE recv, ID mid, int n, ...)
 {
     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++) {