yugui	2010-11-02 00:04:05 +0900 (Tue, 02 Nov 2010)

  New Revision: 29665

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

  Log:
    merges r29205 from trunk into ruby_1_9_2.
    --
    * vm.c (vm_backtrace_each): skip allocator frames which have no
      name.  [ruby-core:32231]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/digest/test_digest.rb
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vm.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29664)
+++ ruby_1_9_2/ChangeLog	(revision 29665)
@@ -1,3 +1,8 @@
+Thu Sep  9 23:25:53 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
Index: ruby_1_9_2/vm.c
===================================================================
--- ruby_1_9_2/vm.c	(revision 29664)
+++ ruby_1_9_2/vm.c	(revision 29665)
@@ -741,7 +741,8 @@
 		id = cfp->me->def->original_id;
 	    else
 		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);
     }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29664)
+++ ruby_1_9_2/version.h	(revision 29665)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 34
+#define RUBY_PATCHLEVEL 35
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/digest/test_digest.rb
===================================================================
--- ruby_1_9_2/test/digest/test_digest.rb	(revision 29664)
+++ ruby_1_9_2/test/digest/test_digest.rb	(revision 29665)
@@ -125,4 +125,11 @@
       Data2 => "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
     }
   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

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