naruse	2012-12-12 02:13:18 +0900 (Wed, 12 Dec 2012)

  New Revision: 38329

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

  Log:
    Experimentally recommit of r38041: specify smaller max length
    
    * vm_dump.c (rb_vm_bugreport): get rid of calling methods in sigsegv
      handler.  based on a patch by charliesome (Charlie Somerville)
      [ruby-core:49573] [Bug #7402]

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_rubyoptions.rb
    trunk/vm_dump.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38328)
+++ ChangeLog	(revision 38329)
@@ -1214,6 +1214,12 @@
 
 	* string.c (rb_str_cmp_m): return fixed value, one of -1,0,+1 always.
 
+Fri Nov 30 16:19:14 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_dump.c (rb_vm_bugreport): get rid of calling methods in sigsegv
+	  handler.  based on a patch by charliesome (Charlie Somerville)
+	  [ruby-core:49573] [Bug #7402]
+
 Fri Nov 30 16:05:44 2012  Eric Hodel  <drbrain@s...>
 
 	* NEWS:  Added RubyGems 2.0.0
Index: vm_dump.c
===================================================================
--- vm_dump.c	(revision 38328)
+++ vm_dump.c	(revision 38329)
@@ -675,14 +675,26 @@
     if (vm) {
 	int i;
 	VALUE name;
+	long len;
+	const int max_name_length = 128;
+# define LIMITED_NAME_LENGTH(s) \
+	(((len = RSTRING_LEN(s)) > max_name_length) ? max_name_length : (int)len)
 
 	name = vm->progname;
-	fprintf(stderr, "* Loaded script: %s\n", StringValueCStr(name));
+	fprintf(stderr, "* Loaded script: %s\n",
+		RSTRING_PTR(name));
 	fprintf(stderr, "\n");
 	fprintf(stderr, "* Loaded features:\n\n");
 	for (i=0; i<RARRAY_LEN(vm->loaded_features); i++) {
 	    name = RARRAY_PTR(vm->loaded_features)[i];
-	    fprintf(stderr, " %4d %s\n", i, StringValueCStr(name));
+	    if (RB_TYPE_P(name, T_STRING)) {
+		fprintf(stderr, " %4d %.*s\n", i,
+			LIMITED_NAME_LENGTH(name), RSTRING_PTR(name));
+	    }
+	    else {
+		fprintf(stderr, " %4d #<%s:%p>\n", i,
+			rb_class2name(CLASS_OF(name)), (void *)name);
+	    }
 	}
 	fprintf(stderr, "\n");
     }
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 38328)
+++ test/ruby/test_rubyoptions.rb	(revision 38329)
@@ -508,6 +508,13 @@
       )x,
       nil,
       opts)
+
+    bug7402 = '[ruby-core:49573]'
+    status = assert_in_out_err(['-e', 'class Bogus; def to_str; exit true; end; end',
+                                '-e', '$".unshift Bogus.new',
+                                '-e', 'Process.kill :SEGV, $$'],
+                               "", //, /#<Bogus:/)
+    assert_not_predicate(status, :success?, "segv but success #{bug7402}")
   end
 
   def test_DATA

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