From: ExtReMLapin <redacted>
Date: Tue, 5 Mar 2024 16:33:08 +0000 (+0100)
Subject: grammars : blacklists character control set (#5888)
X-Git-Tag: upstream/0.0.4488~2138
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=3de31677d36aa4f82d4d99898902d7bcf398e666;p=pkg%2Fggml%2Fsources%2Fllama.cpp

grammars : blacklists character control set (#5888)

* Prevent control characters from being served in json string

* Prevent control characters from being served in json string (array)
---

diff --git a/grammars/json.gbnf b/grammars/json.gbnf
index a9537cdf..a8a80752 100644
--- a/grammars/json.gbnf
+++ b/grammars/json.gbnf
@@ -15,7 +15,7 @@ array  ::=
 
 string ::=
   "\"" (
-    [^"\\] |
+    [^"\\\x7F\x00-\x1F] |
     "\\" (["\\/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..31a3202f 100644
--- a/grammars/json_arr.gbnf
+++ b/grammars/json_arr.gbnf
@@ -24,7 +24,7 @@ array  ::=
 
 string ::=
   "\"" (
-    [^"\\] |
+    [^"\\\x7F\x00-\x1F] |
     "\\" (["\\/bfnrt] | "u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]) # escapes
   )* "\"" ws