Merge pull request xapi-project#3507 from krizex/timebox

Eliminate fd leak in timebox
robhoes · Mar 14, 2018 · d0f9d51 · d0f9d51
2 parents e14d893 + 808eb52
commit d0f9d51
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ocaml/xapi/helpers.ml b/ocaml/xapi/helpers.ml
@@ -1141,8 +1141,9 @@ let timebox ~timeout ~otherwise f =
           with e ->
             result := fun () -> raise e);
          Unix.close fd_out) () in
-  let _ = Thread.wait_timed_read fd_in timeout in
+  let finished = Thread.wait_timed_read fd_in timeout in
   Unix.close fd_in;
+  if not finished then ignore_exn (fun () -> Unix.close fd_out);
   !result ()
 
 (**************************************************************************************)