From bc0577c6c8607d57a13282a34c80f64fe9bf1eef Mon Sep 17 00:00:00 2001
From: glass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 9 Jan 2013 00:59:30 +0000
Subject: * load.c (load_lock): fix not to delete thread shield twice.   it may
 break the shield locked by another thread.   [Bug #7530] [ruby-core:50645]

* test/ruby/test_require.rb: a test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 load.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'load.c')

diff --git a/load.c b/load.c
index 70e3ee8646..147307d07f 100644
--- a/load.c
+++ b/load.c
@@ -668,9 +668,6 @@ load_lock(const char *ftptr)
     }
     switch (rb_thread_shield_wait((VALUE)data)) {
       case Qfalse:
-	data = (st_data_t)ftptr;
-	st_delete(loading_tbl, &data, 0);
-	return 0;
       case Qnil:
 	return 0;
     }
-- 
cgit v1.2.3