merge revision(s) 0a544c0c35f7445d69402d7c53d825384c728017: [Backport #17754]

	Fix segmentation fault when `Module#name` returns non string value
	 [Bug #17754]

	* Add test for NoMethodError#to_s does not segfault

	* Ensure no segfault even if Module#name is overridden
	---
	 error.c                          |  4 +++-
	 test/ruby/test_nomethod_error.rb | 16 ++++++++++++++++
	 2 files changed, 19 insertions(+), 1 deletion(-)

1 files changed, 16 insertions, 0 deletions

diff --git a/test/ruby/test_nomethod_error.rb b/test/ruby/test_nomethod_error.rb
index 170a6c6c57..8b81052905 100644
--- a/test/ruby/test_nomethod_error.rb
+++ b/test/ruby/test_nomethod_error.rb
@@ -90,4 +90,20 @@ class TestNoMethodError < Test::Unit::TestCase
       str.__send__(id)
     end
   end
+
+  def test_to_s
+    pre = Module.new do
+      def name
+        BasicObject.new
+      end
+    end
+    mod = Module.new
+    mod.singleton_class.prepend(pre)
+
+    err = assert_raise(NoMethodError) do
+      mod.this_method_does_not_exist
+    end
+
+    assert_match(/undefined method.+this_method_does_not_exist.+for.+Module/, err.to_s)
+  end
 end