aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--symbol.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e890687e8..c5d168fc37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug 30 19:22:47 2014 Eric Wong <e@80x24.org>
+
+ * symbol.c (rb_sym2id): do not return garbage object
+
Sat Aug 30 06:39:48 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and
diff --git a/symbol.c b/symbol.c
index b3fa55fab9..c3ce50f830 100644
--- a/symbol.c
+++ b/symbol.c
@@ -759,7 +759,7 @@ rb_sym2id(VALUE sym)
}
else {
if (!SYMBOL_PINNED_P(sym)) {
- dsymbol_pindown(sym);
+ return dsymbol_pindown(sym);
}
return (ID)sym;
}