From: ExtReMLapin <redacted>
Date: Tue, 5 Mar 2024 13:44:29 +0000 (+0100)
Subject: grammars : don't allow to output unescaped new line in string (#5885)
X-Git-Tag: upstream/0.0.4488~2140
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=b1a4e994fde929300d4aeb1deb8320c59cb6edec;p=pkg%2Fggml%2Fsources%2Fllama.cpp

grammars : don't allow to output unescaped new line in string (#5885)

* Don't allow grammar json array to output unescaped new line in string

* Don't allow new line in json object string
---

diff --git a/grammars/json.gbnf b/grammars/json.gbnf
index a9537cdf..34e014d5 100644
--- a/grammars/json.gbnf
+++ b/grammars/json.gbnf
@@ -15,7 +15,7 @@ array  ::=
 
 string ::=
   "\"" (
-    [^"\\] |
+    [^"\\\n] |
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
   )* "\"" ws
 
diff --git a/grammars/json_arr.gbnf b/grammars/json_arr.gbnf
index ef53e77a..fd5740ee 100644
--- a/grammars/json_arr.gbnf
+++ b/grammars/json_arr.gbnf
@@ -24,7 +24,7 @@ array  ::=
 
 string ::=
   "\"" (
-    [^"\\] |
+    [^"\\\n] |
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
   )* "\"" ws