Do not crash LSP server on malformed Content-Length

Closes FStarLang#2524
kant2002 · Apr 11, 2022 · 32502df · 32502df
1 parent c25d7c9
commit 32502df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/fstar/FStar.Interactive.Lsp.fst b/src/fstar/FStar.Interactive.Lsp.fst
@@ -192,7 +192,9 @@ let rec parse_header_len (stream: stream_reader) (len: int): int =
   match U.read_line stream with
   | Some s ->
     if U.starts_with s "Content-Length: " then
-      parse_header_len stream (U.int_of_string (U.substring_from s 16))
+      match U.safe_int_of_string (U.substring_from s 16) with
+      | Some new_len -> parse_header_len stream new_len
+      | None -> raise MalformedHeader
     else if U.starts_with s "Content-Type: " then
       parse_header_len stream len
     else if s = "" then

diff --git a/src/ocaml-output/FStar_Interactive_Lsp.ml b/src/ocaml-output/FStar_Interactive_Lsp.ml