From 340cd503a7d0f73bb1ca6446f78793f968a5d5bf Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 28 Jun 2008 12:25:45 +0000 Subject: * include/ruby/ruby.h (struct RRegexp): new field usecnt. replace str and len by src. * gc.c (gc_mark_children): mark src field of regexp. (obj_free): don't free str field. * re.c (REG_BUSY): removed. (rb_reg_initialize): prohibit re-initialize regexp. (rb_reg_search): use usecnt to prevent freeing regexp currently using. this prevents SEGV by: r = /\A((a.)*(a.)*)*b/ r =~ "ab" + "\xc2\xa1".force_encoding("euc-jp") t = Thread.new { r =~ "ab"*8 + "\xc2\xa1".force_encoding("utf-8")} sleep 0.2 r =~ "ab"*8 + "\xc2\xa1".force_encoding("euc-jp") git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index a97ce4c13f..5c8a7a2ff0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Sat Jun 28 21:25:08 2008 Tanaka Akira + + * include/ruby/ruby.h (struct RRegexp): new field usecnt. replace + str and len by src. + + * gc.c (gc_mark_children): mark src field of regexp. + (obj_free): don't free str field. + + * re.c (REG_BUSY): removed. + (rb_reg_initialize): prohibit re-initialize regexp. + (rb_reg_search): use usecnt to prevent freeing regexp currently + using. this prevents SEGV by: + r = /\A((a.)*(a.)*)*b/ + r =~ "ab" + "\xc2\xa1".force_encoding("euc-jp") + t = Thread.new { r =~ "ab"*8 + "\xc2\xa1".force_encoding("utf-8")} + sleep 0.2 + r =~ "ab"*8 + "\xc2\xa1".force_encoding("euc-jp") + Sat Jun 28 21:15:43 2008 Nobuyoshi Nakada * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2, -- cgit v1.2.3