kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r29205 from trunk into ruby_1_9_2.

Browse source 
--
* vm.c (vm_backtrace_each): skip allocator frames which have no
  name.  [ruby-core:32231]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-11-01 15:04:05 +00:00
parent c1fafacd12
commit 55c6c4edda
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Sep 9 23:25:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (vm_backtrace_each): skip allocator frames which have no
name. [ruby-core:32231]
Thu Sep 9 10:44:46 2010 NARUSE, Yui <naruse@ruby-lang.org> Thu Sep 9 10:44:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in * test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in

7
test/digest/test_digest.rb
View file

@ -125,4 +125,11 @@ module TestDigest
Data2 => "12a053384a9c0c88e405a06c27dcf49ada62eb2b", Data2 => "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
} }
end if defined?(Digest::RMD160) end if defined?(Digest::RMD160)
class TestBase < Test::Unit::TestCase
def test_base
bug3810 = '[ruby-core:32231]'
assert_raise(NotImplementedError, bug3810) {Digest::Base.new}
end
end
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 34 #define RUBY_PATCHLEVEL 35
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1

3
vm.c
View file

@ -741,7 +741,8 @@ vm_backtrace_each(rb_thread_t *th, int lev, void (*init)(void *), rb_backtrace_i
id = cfp->me->def->original_id; id = cfp->me->def->original_id;
else else
id = cfp->me->called_id; id = cfp->me->called_id;
if ((*iter)(arg, file, line_no, rb_id2str(id))) break; if (id != ID_ALLOCATOR && (*iter)(arg, file, line_no, rb_id2str(id)))
break;
} }
cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp); cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp);
} }