summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 02:58:54 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-11 02:58:54 +0000
commit0ab057280cee1b67b83bd4e9b1e9a8f5806c7bf1 (patch)
tree0249fb933c2777bf7f6881d11380a82f4ad0c087
parent381b72da1202557b5670f39241c783658915a3da (diff)
Experimentally revert r38041
"vm_dump.c: no methods in segv handler" It may cause segv: http://fb.rubyci.org/~chkbuild/ruby-trunk/log/20121130T090301Z.diff.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_rubyoptions.rb7
-rw-r--r--vm_dump.c16
3 files changed, 2 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 92354090700..c74d2edd007 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1150,12 +1150,6 @@ Fri Nov 30 17:43:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org>
-
- * 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@segment7.net>
* NEWS: Added RubyGems 2.0.0
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 9e8978fd053..16656f0b24e 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -508,13 +508,6 @@ class TestRubyOptions < Test::Unit::TestCase
)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
diff --git a/vm_dump.c b/vm_dump.c
index c2fa33fd4af..1c1a36eca9b 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -675,26 +675,14 @@ rb_vm_bugreport(void)
if (vm) {
int i;
VALUE name;
- long len;
- const int max_name_length = 1024;
-# 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",
- LIMITED_NAME_LENGTH(name), RSTRING_PTR(name));
+ fprintf(stderr, "* Loaded script: %s\n", StringValueCStr(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];
- 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, " %4d %s\n", i, StringValueCStr(name));
}
fprintf(stderr, "\n");
}