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

ruby-changes:26101

From: nobu <ko1@a...>
Date: Mon, 3 Dec 2012 19:21:56 +0900 (JST)
Subject: [ruby-changes:26101] nobu:r38158 (trunk): object.c: test bits at once

nobu	2012-12-03 19:21:46 +0900 (Mon, 03 Dec 2012)

  New Revision: 38158

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

  Log:
    object.c: test bits at once
    
    * object.c (rb_obj_clone): test TAINT and UNTRUSTED bits at once.

  Modified files:
    trunk/object.c

Index: object.c
===================================================================
--- object.c	(revision 38157)
+++ object.c	(revision 38158)
@@ -296,7 +296,8 @@
     if (FL_TEST(singleton, FL_SINGLETON)) {
 	rb_singleton_class_attached(singleton, clone);
     }
-    RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT) | FL_TEST(clone, FL_UNTRUSTED)) & ~(FL_FREEZE|FL_FINALIZE);
+    RBASIC(clone)->flags &= (FL_TAINT|FL_UNTRUSTED);
+    RBASIC(clone)->flags |= RBASIC(obj)->flags & ~(FL_FREEZE|FL_FINALIZE);
     init_copy(clone, obj);
     rb_funcall(clone, id_init_clone, 1, obj);
     RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE;

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

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