diff --git a/ChangeLog b/ChangeLog
index f21ee6a184..49a4c09820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 13 00:46:24 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/util.rb (CGI::pretty): fix the overflow bug
+	  if stripped string.[ruby-dev:37975]
+
 Thu Nov 12 23:08:11 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
 	* lib/cgi/core.rb (read_from_cmdline): this code is better.
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index fbba00b963..42f1336e9f 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -170,7 +170,7 @@ class CGI
   #     # </HTML>
   #
   def CGI::pretty(string, shift = "  ")
-    lines = string.gsub(/(?!\A)<(?:.|\n)*?>/, "\n\\0").gsub(/<(?:.|\n)*?>(?!\n)/, "\\0\n")
+    lines = string.gsub(/(?!\A)<.*?>/m, "\n\\0").gsub(/<.*?>(?!\n)/m, "\\0\n")
     end_pos = 0
     while end_pos = lines.index(/^<\/(\w+)/, end_pos)
       element = $1.dup