summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/objspace/objspace.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dd1f715ae..7db20f6b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 4 16:21:39 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/objspace/objspace.c (count_nodes): fix key for unknown node.
+ based on a patch by tmm1 (Aman Gupta) in [ruby-core:53130] [Bug #8014]
+
Thu Apr 4 16:17:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 66e33a38c4..fd08158676 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -531,7 +531,7 @@ count_nodes(int argc, VALUE *argv, VALUE os)
COUNT_NODE(NODE_LAMBDA);
COUNT_NODE(NODE_OPTBLOCK);
#undef COUNT_NODE
- default: node = INT2FIX(nodes[i]);
+ default: node = INT2FIX(i);
}
rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
}
diff --git a/version.h b/version.h
index ac39612657..59c3880907 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 410
+#define RUBY_PATCHLEVEL 411
#define RUBY_RELEASE_DATE "2013-04-04"
#define RUBY_RELEASE_YEAR 2013