Changeset 11545

Timestamp:

04/25/11 05:18:56 (13 months ago)

Author:

SvenDowideit

Message:

Item10679: html2tml goes into an infinte loop with un-terminated img tags

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML.pm (modified) (2 diffs)

trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML.pm

@@ -53 +53 @@
     my ($class) = @_;
 
+#use handler method names to allow of subclassing of HTML2TML
     my $this = new HTML::Parser(
-        start_h          => [ \&_openTag,  'self,tagname,attr' ],
-        end_h            => [ \&_closeTag, 'self,tagname' ],
-        text_h           => [ \&_text,     'self,text' ],
-        comment_h        => [ \&_comment,  'self,text' ],
-        declaration_h    => [ \&_ignore,   'self' ],
-        start_document_h => [ \&_ignore,   'self' ],
-        end_document_h   => [ \&_ignore,   'self' ],
-        default_h        => [ \&_default,  'self,event,text' ]
+        start_h          => [ '_openTag',  'self,tagname,attr' ],
+        end_h            => [ '_closeTag', 'self,tagname' ],
+        text_h           => [ '_text',     'self,text' ],
+        comment_h        => [ '_comment',  'self,text' ],
+        declaration_h    => [ '_ignore',   'self' ],
+        start_document_h => [ '_ignore',   'self' ],
+        end_document_h   => [ '_ignore',   'self' ],
+        default_h        => [ '_default',  'self,event,text' ],
+        comment_h         => [ '_ignore',   'self' ]
     );
 
@@ -202 +204 @@
 # Autoclose tags without waiting for a /tag
 my %autoClose = map { $_ => 1 }
-  qw( area base basefont br col embed frame hr input link meta param );
+  qw( area base basefont br col embed frame hr input link meta param img );
 
 # Support auto-close of the tags that are most typically incorrectly