implemented PCRE error checking and TexyPcreException

Texy/Texy.php

@@ -65,6 +65,27 @@
 
 
 
+/**
+ * Checking preg_last_error()
+ */
+class TexyPcreException extends Exception
+{
+	public function __construct($message = '%msg.')
+	{
+		static $messages = array(
+			PREG_INTERNAL_ERROR => 'Internal error',
+			PREG_BACKTRACK_LIMIT_ERROR => 'Backtrack limit was exhausted',
+			PREG_RECURSION_LIMIT_ERROR => 'Recursion limit was exhausted',
+			PREG_BAD_UTF8_ERROR => 'Malformed UTF-8 data',
+			5 => 'Offset didn\'t correspond to the begin of a valid UTF-8 code point', // PREG_BAD_UTF8_OFFSET_ERROR
+		);
+		$code = preg_last_error();
+		parent::__construct(str_replace('%msg', isset($messages[$code]) ? $messages[$code] : 'Unknown error', $message), $code);
+	}
+}
+
+
+
 /**
  * For Texy 1 backward compatibility.
  */
@@ -478,6 +499,9 @@ public function process($text, $singleLine = FALSE)
 		$this->tabWidth = max(1, (int) $this->tabWidth);
 		while (strpos($text, "\t") !== FALSE) {
 			$text = preg_replace_callback('#^([^\t\n]*+)\t#mU', array($this, 'tabCb'), $text);
+			if (preg_last_error()) {
+				throw new TexyPcreException;
+			}
 		}
 
 		// user before handler
@@ -626,6 +650,9 @@ final public function stringToText($s)
 
 		// remove tags
 		$s = preg_replace('#<(script|style)(.*)</\\1>#Uis', '', $s);
+		if (preg_last_error()) {
+			throw new TexyPcreException;
+		}
 		$s = strip_tags($s);
 		$s = preg_replace('#\n\s*\n\s*\n[\n\s]*\n#', "\n\n", $s);
 

Texy/libs/TexyParser.php

@@ -102,6 +102,9 @@ public function next($pattern, &$matches)
 		if ($ok) {
 			$this->offset += strlen($matches[0][0]) + 1;  // 1 = "\n"
 			foreach ($matches as $key => $value) $matches[$key] = $value[0];
+
+		} elseif (preg_last_error()) {
+			throw new TexyPcreException("%msg; pattern: {$pattern}Am");
 		}
 		return $ok;
 	}
@@ -155,6 +158,9 @@ public function parse($text)
 				$ms,
 				PREG_OFFSET_CAPTURE | PREG_SET_ORDER
 			);
+			if (preg_last_error()) {
+				throw new TexyPcreException("%msg; pattern: $pattern[pattern]");
+			}
 
 			foreach ($ms as $m) {
 				$offset = $m[0][1];
@@ -295,6 +301,9 @@ public function parse($text)
 						$arrOffset[$name] = $m[0][1];
 						foreach ($m as $keyx => $value) $m[$keyx] = $value[0];
 
+					} elseif (preg_last_error()) {
+						throw new TexyPcreException("%msg; pattern: {$pl[$name]['pattern']}");
+
 					} else {
 						// try next time?
 						if (!$pl[$name]['again'] || !preg_match($pl[$name]['again'], $text, $foo, NULL, $offset + $delta)) {

Texy/modules/TexyBlockModule.php

@@ -61,6 +61,9 @@ public function beforeBlockParse($parser, & $text)
 			"\$1\$2\n\\--",
 			$text
 		);
+		if (preg_last_error()) {
+			throw new TexyPcreException;
+		}
 	}
 
 

Texy/modules/TexyHtmlOutputModule.php

@@ -76,6 +76,9 @@ public function postProcess($texy, & $s)
 			array($this, 'cb'),
 			$s . '</end/>'
 		);
+		if (preg_last_error()) {
+			throw new TexyPcreException;
+		}
 
 		// empty out stack
 		foreach ($this->tagStack as $item) $s .= $item['close'];

Texy/modules/TexyImageModule.php

@@ -80,6 +80,9 @@ public function beforeParse($texy, & $text)
 				array($this, 'patternReferenceDef'),
 				$text
 			);
+			if (preg_last_error()) {
+				throw new TexyPcreException;
+			}
 		}
 	}
 

Texy/modules/TexyLinkModule.php

@@ -96,6 +96,9 @@ public function beforeParse($texy, & $text)
 				array($this, 'patternReferenceDef'),
 				$text
 			);
+			if (preg_last_error()) {
+				throw new TexyPcreException;
+			}
 		}
 	}
 

Texy/modules/TexyParagraphModule.php

@@ -60,6 +60,9 @@ public function process($parser, $content, $el)
 				if ($s === '') continue;
 				$mod = new TexyModifier;
 				$mod->setProperties($mMod);
+
+			} elseif (preg_last_error()) {
+				throw new TexyPcreException;
 			}
 
 			$res = $tx->invokeAroundHandlers('paragraph', $parser, array($s, $mod));