Fix infinite loop when converting invalid html to plaintext (#1489566)

2 files changed, 32 insertions, 0 deletions

diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 01362e6fb..3b4508da9 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -616,6 +616,10 @@ class rcube_html2text
 
                     break;
                 }
+                // abort on invalid tag structure (e.g. no closing tag found)
+                else {
+                    break;
+                }
             }
             while ($end || $next);
         }
diff --git a/tests/Framework/Html2text.php b/tests/Framework/Html2text.php
index 3e0df48d9..2c7759f7d 100644
--- a/tests/Framework/Html2text.php
+++ b/tests/Framework/Html2text.php
@@ -75,4 +75,32 @@ EOF;
         $this->assertContains('>> INNER 3', $res, 'Quote inner');
         $this->assertContains('> OUTER END', $res, 'Quote outer');
     }
+
+    function test_broken_blockquotes()
+    {
+        // no end tag
+        $html = <<<EOF
+Begin<br>
+<blockquote>QUOTED TEXT
+<blockquote>
+NO END TAG FOUND
+EOF;
+        $ht = new rcube_html2text($html, false, false);
+        $res = $ht->get_text();
+
+        $this->assertContains('QUOTED TEXT NO END TAG FOUND', $res, 'No quoating on invalid html');
+
+        // with some (nested) end tags
+        $html = <<<EOF
+Begin<br>
+<blockquote>QUOTED TEXT
+<blockquote>INNER 1</blockquote>
+<blockquote>INNER 2</blockquote>
+NO END TAG FOUND
+EOF;
+        $ht = new rcube_html2text($html, false, false);
+        $res = $ht->get_text();
+
+        $this->assertContains('QUOTED TEXT INNER 1 INNER 2 NO END', $res, 'No quoating on invalid html');
+    }
 }