From 5d7d89d193f0bc6853f73f691d21235622dbb6e0 Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Tue, 9 Dec 2008 08:54:35 -0600 Subject: [PATCH] Fix Slowdown in Sanitizer Regexp Deal with the issue: http://code.google.com/p/html5lib/issues/detail?id=83 by fixing a regexp used for sanitizing inline style attributes. --- lib/sanitizer.rb | 2 +- vendor/plugins/HTML5lib/lib/html5/sanitizer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sanitizer.rb b/lib/sanitizer.rb index bfdc711c..01391232 100644 --- a/lib/sanitizer.rb +++ b/lib/sanitizer.rb @@ -175,7 +175,7 @@ module Sanitizer # gauntlet return '' unless style =~ /^([-:,;#%.\sa-zA-Z0-9!]|\w-\w|\'[\s\w]+\'|\"[\s\w]+\"|\([\d,\s]+\))*$/ - return '' unless style =~ /^(\s*[-\w]+\s*:\s*[^:;]*(;|$))*$/ + return '' unless style =~ /^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$/ clean = [] style.scan(/([-\w]+)\s*:\s*([^:;]*)/) do |prop, val| diff --git a/vendor/plugins/HTML5lib/lib/html5/sanitizer.rb b/vendor/plugins/HTML5lib/lib/html5/sanitizer.rb index f9bf445a..3055b7a8 100644 --- a/vendor/plugins/HTML5lib/lib/html5/sanitizer.rb +++ b/vendor/plugins/HTML5lib/lib/html5/sanitizer.rb @@ -168,7 +168,7 @@ module HTML5 # gauntlet return '' unless style =~ /^([-:,;#%.\sa-zA-Z0-9!]|\w-\w|\'[\s\w]+\'|\"[\s\w]+\"|\([\d,\s]+\))*$/ - return '' unless style =~ /^(\s*[-\w]+\s*:\s*[^:;]*(;|$))*$/ + return '' unless style =~ /^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$/ clean = [] style.scan(/([-\w]+)\s*:\s*([^:;]*)/) do |prop, val|