From 9a938987cb6b3ed3f0c7735f5b19b10f45694a3f Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 10 Dec 2013 14:58:43 +0000 Subject: date_strptime.c: get rid of backtrack explosion * ext/date/date_strptime.c (date__strptime_internal): unset case-insensitive flag for [:alpha:], which already implies both cases, to get rid of backtrack explosion. [ruby-core:58984] [Bug #9221] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/date/date_strptime.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66b79d950a..2cd5cf182b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 10 23:58:30 2013 Nobuyoshi Nakada + + * ext/date/date_strptime.c (date__strptime_internal): unset + case-insensitive flag for [:alpha:], which already implies both + cases, to get rid of backtrack explosion. [ruby-core:58984] + [Bug #9221] + Tue Dec 10 23:44:42 2013 Nobuyoshi Nakada * array.c (rb_ary_hash): add salt to differentiate false and empty diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c index c6a5969172..3e1b0f85ea 100644 --- a/ext/date/date_strptime.c +++ b/ext/date/date_strptime.c @@ -567,8 +567,8 @@ date__strptime_internal(const char *str, size_t slen, static const char pat_source[] = "\\A(" "(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?" - "|[[:alpha:].\\s]+(?:standard|daylight)\\s+time\\b" - "|[[:alpha:]]+(?:\\s+dst)?\\b" + "|(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\s+time\\b" + "|(?-i:[[:alpha:]]+)(?:\\s+dst)?\\b" ")"; static VALUE pat = Qnil; VALUE m, b; -- cgit v1.2.3