* split evil let definition (ic, oc) = ... into two subsequent

  definitions
* using Gzip.open_in_chan to avoid file descriptor leak

diff --git a/helm/ocaml/getter/http_getter_misc.ml b/helm/ocaml/getter/http_getter_misc.ml
index 897442e63206e90fcc0f9d25f7f7844836e31af2..941efe25c497a8f7c72f52537bf9bc809d6c410c 100644 (file)
--- a/helm/ocaml/getter/http_getter_misc.ml
+++ b/helm/ocaml/getter/http_getter_misc.ml
@@ -129,15 +129,26 @@ let gunzip ?(keep = false) ?output fname =
   in
   Http_getter_logger.log ~level:3
     (sprintf "gunzipping %s (keep: %b, output: %s)" fname keep output);
-  let (ic, oc) = (Gzip.open_in fname, open_out output) in
-  let buf = String.create bufsiz in
-  (try
-    while true do
-      let bytes = Gzip.input ic buf 0 bufsiz in
-      if bytes = 0 then raise End_of_file else Pervasives.output oc buf 0 bytes
-    done
-  with End_of_file -> ());
-  Gzip.close_in ic; close_out oc;
+  (* Open the zipped file manually since Gzip.open_in may
+   * leak the descriptor if it raises an exception *)
+  let zic = open_in fname in
+  begin
+    try
+      let ic = Gzip.open_in_chan zic in
+      Http_getter_logger.log (sprintf "LUCA: OK" );
+      let oc = open_out output in
+      let buf = String.create bufsiz in
+      (try
+        while true do
+          let bytes = Gzip.input ic buf 0 bufsiz in
+          if bytes = 0 then raise End_of_file else Pervasives.output oc buf 0 bytes
+        done
+      with End_of_file -> ());
+      close_out oc
+    with
+      e -> close_in zic ; raise e
+  end ;
+  close_in zic ;
   if not keep then Sys.remove fname
 ;;
 
@@ -189,7 +200,7 @@ let http_get url =
       let size = (Unix.stat fname).Unix.st_size in
       let buf = String.create size in
       let ic = open_in fname in
-      really_input ic buf 0 size;
+      really_input ic buf 0 size ;
       close_in ic;
       Some buf
     with Unix.Unix_error (Unix.ENOENT, "stat", _) -> None