simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 11:15:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(sexp): handle non-ascii escapes in strings

Browse source 
close #338
This commit is contained in:
Simon Cruanes 2020-12-07 23:33:34 -05:00
parent 43701e6726
commit 52abbcd978
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/CCSexp_lex.mll
View file

@ -43,7 +43,18 @@
| Escaped_int_1 i, ('0'..'9' as c) -> | Escaped_int_1 i, ('0'..'9' as c) ->
st := Escaped_int_2 (10*i+Char.code c - Char.code '0') st := Escaped_int_2 (10*i+Char.code c - Char.code '0')
| Escaped_int_2 i, ('0'..'9' as c) -> | Escaped_int_2 i, ('0'..'9' as c) ->
Buffer.add_char buf (Char.chr (10*i+Char.code c - Char.code '0')); let n = 10*i+Char.code c - Char.code '0' in
if n < 256 then (
Buffer.add_char buf (Char.chr n);
) else (
(* non-ascii unicode code point: encode to utf8 on the fly *)
let c =
try Uchar.of_int n
with _ ->
failwith (Printf.sprintf "CCSexp: invalid unicode codepont '%d'" n)
in
CCUtf8_string.uchar_to_bytes c (Buffer.add_char buf)
);
st := Not_escaped st := Not_escaped
| (Escaped | Escaped_int_1 _ | Escaped_int_2 _), c -> | (Escaped | Escaped_int_1 _ | Escaped_int_2 _), c ->
error lexbuf (Printf.sprintf "wrong escape `%c`" c) error lexbuf (Printf.sprintf "wrong escape `%c`" c)