diff options
| author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-27 14:25:27 +0000 |
|---|---|---|
| committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-27 14:25:27 +0000 |
| commit | 606f59bbffe149112efeb5322cb4f6d22362589a (patch) | |
| tree | 0c264a854bf8b3a7b9913c3c259affebbca56c74 | |
| parent | 9c8f53c10d3002fa97382403d1c8021247807d82 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 1 | ||||
| -rw-r--r-- | vm_dump.c | 6 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Wed Jan 27 23:22:54 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * 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 <zn@mbf.nifty.com> * 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`<main>'\n -e:1:in\s`kill'\n\n (?: @@ -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)) { |