From 606f59bbffe149112efeb5322cb4f6d22362589a Mon Sep 17 00:00:00 2001 From: kazu Date: Wed, 27 Jan 2010 14:25:27 +0000 Subject: [PATCH] * vm_dump.c (bugreport_backtrace): trivial change. * vm_dump.c (rb_vm_bugreport): uninitialized local variable i. * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test): follow above change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ test/ruby/test_rubyoptions.rb | 1 + vm_dump.c | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeeeef1ef3..6beb2f84b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Jan 27 23:22:54 2010 Kazuhiro NISHIYAMA + + * vm_dump.c (bugreport_backtrace): trivial change. + + * vm_dump.c (rb_vm_bugreport): uninitialized local variable i. + + * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test): + follow above change. + Wed Jan 27 23:20:52 2010 Kazuhiro NISHIYAMA * test/ruby/test_exception.rb diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 7e115bfba3..1556af654e 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -333,6 +333,7 @@ class TestRubyOptions < Test::Unit::TestCase --\scontrol\sframe\s----------\n (?:c:.*\n)* ---------------------------\n + --\sRuby\slevel\sbacktrace\sinformation\s----------------------------------------\n -e:1:in\s`
'\n -e:1:in\s`kill'\n\n (?: diff --git a/vm_dump.c b/vm_dump.c index c9c621fe0e..0aa8dae570 100644 --- a/vm_dump.c +++ b/vm_dump.c @@ -571,8 +571,8 @@ static int bugreport_backtrace(void *arg, VALUE file, int line, VALUE method) { if (!*(int *)arg) { - fprintf(stderr, "-- Ruby level backtrace information" - "-----------------------------------------\n"); + fprintf(stderr, "-- Ruby level backtrace information " + "----------------------------------------\n"); *(int *)arg = 1; } fprintf(stderr, "%s:%d:in `%s'\n", RSTRING_PTR(file), line, RSTRING_PTR(method)); @@ -586,7 +586,7 @@ void rb_vm_bugreport(void) { if (GET_THREAD()->vm) { - int i; + int i = 0; SDR(); if (rb_backtrace_each(bugreport_backtrace, &i)) {