Fix HTML scanner: Don't crash if HTML in a diff contains a JavaScript tag.

korny · korny · commit f5bb55cc14cc · 2012-10-07T02:59:02.000+02:00
diff --git a/Changes.textile b/Changes.textile
@@ -7,6 +7,7 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
 h2. Next Version
  
 * add @:string/:char@, remove @:regexp/:function@ color from Terminal encoder [GH #29, thanks to Kyrylo Silin]
+* Fix HTML scanner: Don't crash if HTML in a diff contains a JavaScript tag.
 
 h2. Changes in 1.0.7
  
diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
@@ -69,6 +69,7 @@ def reset
     def setup
       @state = :initial
       @plain_string_content = nil
+      @in_tag = nil
     end
     
     def scan_java_script encoder, code
@@ -83,7 +84,8 @@ def scan_java_script encoder, code
     def scan_tokens encoder, options
       state = options[:state] || @state
       plain_string_content = @plain_string_content
-      in_tag = in_attribute = nil
+      in_tag = @in_tag
+      in_attribute = nil
       
       encoder.begin_group :string if state == :attribute_value_string
       
@@ -237,6 +239,7 @@ def scan_tokens encoder, options
       if options[:keep_state]
         @state = state
         @plain_string_content = plain_string_content
+        @in_tag = in_tag
       end
       
       encoder.end_group :string if state == :attribute_value_string
