quote $ and \ to not confuse the Matcher.

apache · Aug 8, 2021 · f90f714 · f90f714
1 parent 4a476e6
commit f90f714
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...src/main/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPlugin.java b/...src/main/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPlugin.java
@@ -82,7 +82,7 @@ public String render(WeblogEntry entry, String str) {
 
     // we only have to encode the opening angle bracket for valid html/xhtml
     private static String encode(String code_inner) {
-        return code_inner.replace("<", LT);
+        return Matcher.quoteReplacement(code_inner.replace("<", LT)); // matchers hate $ and \
     }
 
 }
diff --git a/...test/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPluginTest.java b/...test/java/org/apache/roller/weblogger/business/plugins/entry/EncodePreTagsPluginTest.java
@@ -84,6 +84,8 @@ public void substitution2() {
                 "  </head>\n" +
                 "  <body>\n" +
                 "      <pre><code class='language-java'>private final Map<String, List<?>> map = new HashMap<>();</code></pre>\n"+
+                "      <pre><code class='language-bash'>$JDK/bin/java -version</code></pre>\n"+
+                "      <pre><code class='language-slash'>\\\\</code></pre>\n"+
                 "  </body>\n" +
                 "</html>";
 
@@ -94,6 +96,8 @@ public void substitution2() {
                 "  </head>\n" +
                 "  <body>\n" +
                 "      <pre><code class='language-java'>private final Map&lt;String, List&lt;?>> map = new HashMap&lt;>();</code></pre>\n"+
+                "      <pre><code class='language-bash'>$JDK/bin/java -version</code></pre>\n"+
+                "      <pre><code class='language-slash'>\\\\</code></pre>\n"+
                 "  </body>\n" +
                 "</html>";
         assertEquals(expected, instance.render(null, input));