From 6ae6a8c7bc86e9740850e64125deceb7d8a01fce Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 4 Feb 2015 19:03:20 +0000
Subject: [PATCH] * vm_insnhelper.c: Fix symbol leak with +send+ and
 method_missing [#10828]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  4 ++++
 test/ruby/test_symbol.rb | 16 ++++++++++++++++
 vm_insnhelper.c          | 17 +++++++++--------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b1c4a3255..b9537b2495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb  5 03:59:33 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* vm_insnhelper.c: Fix symbol leak with +send+ [Bug #10828]
+
 Wed Feb  4 20:26:54 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (Init_win32ole): should not use atexit to
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb
index db0d135b90..5d2e2c3267 100644
--- a/test/ruby/test_symbol.rb
+++ b/test/ruby/test_symbol.rb
@@ -258,4 +258,20 @@ class TestSymbol < Test::Unit::TestCase
       10.times { 42.send "send should not leak #{i} - sym".to_sym rescue nil }
     end
   end
+
+  def test_symbol_send_leak_string_custom_method_missing
+    x = Object.new
+    def x.method_missing(*); end
+    assert_no_immortal_symbol_created do
+      10.times { |i| x.send "send should not leak #{i} - str mm" }
+    end
+  end
+
+  def test_symbol_send_leak_symbol_custom_method_missing
+    x = Object.new
+    def x.method_missing(*); end
+    assert_no_immortal_symbol_created do
+      10.times { |i| x.send "send should not leak #{i} - sym mm".to_sym }
+    end
+  end
 end
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 84c2ca2ae6..a65ba9129d 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1531,16 +1531,17 @@ vm_call_opt_send(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *c
 	    VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, ci->recv, rb_long2int(ci->argc), &TOPN(i));
 	    rb_exc_raise(exc);
 	}
-	ci->mid = rb_to_id(sym);
-    }
-
-    /* shift arguments */
-    if (i > 0) {
-	MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i);
+	ci->mid = idMethodMissing;
+	th->method_missing_reason = ci->aux.missing_reason = NOEX_VCALL;
+    } else {
+	/* shift arguments */
+	if (i > 0) {
+	    MEMMOVE(&TOPN(i), &TOPN(i-1), VALUE, i);
+	}
+	ci->argc -= 1;
+	DEC_SP(1);
     }
     ci->me = rb_method_entry_without_refinements(CLASS_OF(ci->recv), ci->mid, &ci->defined_class);
-    ci->argc -= 1;
-    DEC_SP(1);
 
     ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND;