Fix server node_state request crash on invalid node id (issue #983)

goblint · Feb 15, 2023 · e974e3a · e974e3a
1 parent 59127e9
commit e974e3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/framework/node.ml b/src/framework/node.ml
@@ -57,6 +57,7 @@ let find_fundec (node: t) =
   | Function fd -> fd
   | FunctionEntry fd -> fd
 
+(** @raise Not_found *)
 let of_id s =
   let ix = Str.search_forward (Str.regexp {|[0-9]+$|}) s 0 in
   let id = int_of_string (Str.string_after s ix) in
@@ -68,5 +69,5 @@ let of_id s =
     match prefix with
     | "ret" -> Function fundec
     | "fun" -> FunctionEntry fundec
-    | _     -> invalid_arg "Node.of_id: invalid prefix"
+    | _     -> raise Not_found
 
diff --git a/src/util/server.ml b/src/util/server.ml
@@ -324,10 +324,13 @@ let () =
     type params = { nid: string }  [@@deriving of_yojson]
     type response = Yojson.Safe.t [@@deriving to_yojson]
     let process { nid } serv =
-      let n = Node.of_id nid in
-      match !Control.current_node_state_json n with
-      | Some json -> json
-      | None -> Response.Error.(raise (make ~code:InvalidRequest ~message:"not analyzed, non-existent or dead node" ()))
+      match Node.of_id nid with
+      | n ->
+        begin match !Control.current_node_state_json n with
+          | Some json -> json
+          | None -> Response.Error.(raise (make ~code:InvalidRequest ~message:"not analyzed, non-existent or dead node" ()))
+        end
+      | exception Not_found -> Response.Error.(raise (make ~code:InvalidRequest ~message:"not analyzed or non-existent node" ()))
   end);
 
   register (module struct