Changeset b9ec2bd in github

Timestamp:

Jul 28, 2010 8:22:04 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

0d35d6b

Parents:

f05c458

Message:

• Added handling of PCRE limits errors in rcmail_wash_html() (#1486856)

File:

• program/steps/mail/func.inc (modified) (1 diff)

program/steps/mail/func.inc

@@ -626 +626 @@
   );
   $html = preg_replace($html_search, $html_replace, $html);
+
+  // PCRE errors handling (#1486856), should we use something like for every preg_* use?
+  if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
+    $errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";
+
+    if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR)
+      $errstr .= " Consider raising pcre.backtrack_limit!";
+    if ($preg_error == PREG_RECURSION_LIMIT_ERROR)
+      $errstr .= " Consider raising pcre.recursion_limit!";
+
+    raise_error(array('code' => 600, 'type' => 'php',
+        'line' => __LINE__, 'file' => __FILE__,
+        'message' => $errstr), true, false);
+    return '';
+  }
 
   // fix (unknown/malformed) HTML tags before "wash"