diff --git a/ChangeLog b/ChangeLog
index 7ffc47f264..301fba0f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
diff --git a/test/digest/test_digest.rb b/test/digest/test_digest.rb
index 9f95afa1de..e35047e979 100755
--- a/test/digest/test_digest.rb
+++ b/test/digest/test_digest.rb
@@ -125,4 +125,11 @@ module TestDigest
       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
diff --git a/version.h b/version.h
index 4f06b96aa4..8735f51c87 100644
--- a/version.h
+++ b/version.h
@@ -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
diff --git a/vm.c b/vm.c
index d222a46412..f4034b170d 100644
--- a/vm.c
+++ b/vm.c
@@ -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;
 	    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);
     }