Fixup #449: C/C++/Java printer: handle null when escaping strings

This is a precaution, should not happen unless there are other bugs (e.g. the one introduced in d5ba1ac).
BNFC · Jul 26, 2023 · 4e36945 · 4e36945
1 parent b4d755c
commit 4e36945
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/source/src/BNFC/Backend/C/CFtoCPrinter.hs b/source/src/BNFC/Backend/C/CFtoCPrinter.hs
@@ -270,7 +270,7 @@ mkCFile cf groups = concat
      [
       "void bufEscapeS(const char *s)",
       "{",
-      "  while (*s) bufEscapeC(*s++);",
+      "  if (s) while (*s) bufEscapeC(*s++);",
       "}",
       "void bufEscapeC(const char c)",
       "{",

diff --git a/source/src/BNFC/Backend/CPP/PrettyPrinter.hs b/source/src/BNFC/Backend/CPP/PrettyPrinter.hs
@@ -132,7 +132,7 @@ mkHFile useStl inPackage cf groups = unlines
     "",
     "  void inline bufEscape(const char *s)",
     "  {",
-    "    while (*s) bufEscape(*s++);",
+    "    if (s) while (*s) bufEscape(*s++);",
     "  }",
     "",
     if useStl then render (nest 2 $ bufAppendString "bufEscape") else "",

diff --git a/source/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs b/source/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
@@ -87,6 +87,7 @@ cf2JavaPrinter packageBase packageAbsyn cf =
       "  private static void printQuoted(String s) { render(\"\\\"\" + escape(s) + \"\\\"\"); }",
       "",
       "  public static String escape(String s) {",
+      "    if (s == null) return null;",
       "    return s.replace(\"\\\\\", \"\\\\\\\\\")",
       "            .replace(\"\\t\", \"\\\\t\")",
       "            .replace(\"\\b\", \"\\\\b\")",