Fixes #19 Special characters within inline code span should be escaped.

kzykhys · Nov 30, 2013 · 412c8b2 · 412c8b2
1 parent b7cb888
commit 412c8b2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/Ciconia/Extension/Core/CodeExtension.php b/src/Ciconia/Extension/Core/CodeExtension.php
@@ -75,15 +75,19 @@ public function processCodeSpan(Text $text)
             return;
         }
 
+        $chars = ['\\\\', '`', '\*', '_', '{', '}', '\[', '\]', '\(', '\)', '>', '#', '\+', '\-', '\.', '!'];
+        $chars = implode('|', $chars);
+
         /** @noinspection PhpUnusedParameterInspection */
         $text->replace('{
             (`+)        # $1 = Opening run of `
             (.+?)       # $2 = The code block
             (?<!`)
             \1          # Matching closer
             (?!`)
-        }x', function (Text $w, Text $b, Text $code) {
+        }x', function (Text $w, Text $b, Text $code) use ($chars) {
             $code->trim()->escapeHtml(ENT_NOQUOTES);
+            $code->replace(sprintf('/(?<!\\\\)(%s)/', $chars), '\\\\${1}');
 
             return $this->getRenderer()->renderCodeSpan($code);
         });

diff --git a/src/Ciconia/Extension/Core/EscaperExtension.php b/src/Ciconia/Extension/Core/EscaperExtension.php
@@ -84,7 +84,7 @@ public function getName()
     protected function generateSpecialCharsHash()
     {
         $hashes = array();
-        $chars = array('\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!');
+        $chars  = array('\\', '`', '*', '_', '{', '}', '[', ']', '(', ')', '>', '#', '+', '-', '.', '!');
 
         foreach ($chars as $char) {
             $hashes[$char] = sprintf('{escape:md5(%s)}', md5($char));

diff --git a/test/Ciconia/Resources/core/em-codespan.md b/test/Ciconia/Resources/core/em-codespan.md
@@ -0,0 +1,5 @@
+`user_name` `user_name`
+
+`_EOF_` `_EOF_`
+
+`__DIR__` `__DIR__`
diff --git a/test/Ciconia/Resources/core/em-codespan.out b/test/Ciconia/Resources/core/em-codespan.out
@@ -0,0 +1,5 @@
+<p><code>user_name</code> <code>user_name</code></p>
+
+<p><code>_EOF_</code> <code>_EOF_</code></p>
+
+<p><code>__DIR__</code> <code>__DIR__</code></p>