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 a9537cdf9fbe49c79967090eab759973c52f2136..a8a80752e656266eaf593c84c4e12c3883fe5e1e 100644 (file)
--- 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 ef53e77a0baddc5c1dbdcaf505c3597338a47677..31a3202f863c1e39a5d34f763df5b33e717f8be2 100644 (file)
--- 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