[前][次][番号順一覧][スレッド一覧]

ruby-changes:35373

From: normal <ko1@a...>
Date: Tue, 9 Sep 2014 05:52:13 +0900 (JST)
Subject: [ruby-changes:35373] normal:r47455 (trunk): symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return

normal	2014-09-09 05:51:57 +0900 (Tue, 09 Sep 2014)

  New Revision: 47455

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

  Log:
    symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return
    
    This is not a complete fix for bug 10206, but seems to reduce
    that crash and also looks correct.

  Modified files:
    trunk/ChangeLog
    trunk/symbol.c
Index: symbol.c
===================================================================
--- symbol.c	(revision 47454)
+++ symbol.c	(revision 47455)
@@ -525,6 +525,9 @@ rb_intern_cstr_without_pindown(const cha https://github.com/ruby/ruby/blob/trunk/symbol.c#L525
     OBJ_FREEZE(str);
 
     if (st_lookup(global_symbols.str_id, str, &id)) {
+	if (ID_DYNAMIC_SYM_P((ID)id)) {
+	    return (ID)dsymbol_check((VALUE)id);
+	}
 	return (ID)id;
     }
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47454)
+++ ChangeLog	(revision 47455)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Sep  9 05:48:42 2014  Eric Wong  <e@8...>
+
+	* symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return
+	  This is not a complete fix for bug 10206, but seems to reduce
+	  that crash and also looks correct.
+
 Tue Sep  9 04:36:24 2014  Eric Wong  <e@8...>
 
 	* vm_core.h (rb_env_t): use flexible array

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

[前][次][番号順一覧][スレッド一覧]