initial import

[patches.git] / darcs-check-preg-match.patch

--- old-dokuwiki/inc/parser/lexer.php	2007-05-25 17:39:03.000000000 -0400
+++ new-dokuwiki/inc/parser/lexer.php	2007-05-25 17:39:03.000000000 -0400
@@ -112,11 +112,16 @@
             return false;
         }
 
-        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+        $match = preg_match($this->_getCompoundedRegex(), $subject, $matches);
+        if (is_bool($match) && $match == false) {
+            /* some problem occurred */
+            return -1;
+        } else if ($match == 0) {
             $split = array($subject, "", "");
             return false;
         }
 
+
         $idx = count($matches)-2;
 
         list($pre, $post) = preg_split($this->_patterns[$idx].$this->_getPerlMatchingFlags(), $subject, 2);
@@ -535,7 +540,10 @@
         if ($raw === "") {
             return true;
         }
-        if ($action = $this->_regexes[$this->_mode->getCurrent()]->split($raw, $split)) {
+        $action = $this->_regexes[$this->_mode->getCurrent()]->split($raw, $split);
+        if (is_int($action) && $action == -1)
+            return false;
+        if ($action) {
             list($unparsed, $match, $raw) = $split;
             return array($unparsed, $match, $action);
         }