Changeset 7123

Timestamp:

01/30/10 02:56:30 (7 months ago)

Author:

dbaelde

Message:

Fix file descriptor leak in the new decoder detection plugins.
Thanks to Romain for spotting immediately this gross mistake!
I introduced Tutils.finalize for similar needs in the future.

Location:

trunk/liquidsoap/src

Files:

• decoder/mp3.ml (modified) (1 diff)
• decoder/ogg_decoder.ml (modified) (1 diff)
• formats/wavformat.ml (modified) (1 diff)
• tools/tutils.ml (modified) (1 diff)
• tools/tutils.mli (modified) (1 diff)

trunk/liquidsoap/src/decoder/mp3.ml

@@ -65 +65 @@
 let get_type filename =
   let fd = Mad.openfile filename in
-    ignore(Mad.decode_frame_float fd);
-    let rate,channels,_ = Mad.get_output_format fd in
-      log#f 4
-        "Libmad recognizes %S as MP3 (%dHz,%d channels)."
-        filename rate channels ;
-      Mad.close fd ;
-      { Frame.
-          audio = channels ;
-          video = 0 ;
-          midi  = 0 }
+    Tutils.finalize ~k:(fun () -> Mad.close fd)
+      (fun () ->
+         ignore(Mad.decode_frame_float fd);
+         let rate,channels,_ = Mad.get_output_format fd in
+           log#f 4
+             "Libmad recognizes %S as MP3 (%dHz,%d channels)."
+             filename rate channels ;
+           { Frame.
+             audio = channels ;
+             video = 0 ;
+             midi  = 0 })
 
 let () =

trunk/liquidsoap/src/decoder/ogg_decoder.ml

@@ -180 +180 @@
 let get_type filename =
   let sync,fd = Ogg.Sync.create_from_file filename in
-  let decoder = Ogg_demuxer.init sync in
-  let feed ((buf,_),_) =
-    raise (Channels (Array.length buf))
-  in
-  let audio =
-    try
-      Ogg_demuxer.decode_audio_rec decoder feed;
-      raise Not_found
-    with
-      | Channels x -> x
-      | Not_found  -> 0
-  in
-  let feed (buf,_) =
-    raise (Channels 1)
-  in
-  let video =
-    try
-      Ogg_demuxer.decode_video_rec decoder feed;
-      raise Not_found
-    with
-      | Channels x -> x
-      | Not_found  -> 0
-  in
-  let c_type =
-    { Frame.
-        audio = audio ;
-        video = video ;
-        midi  = 0 }
-  in
-    Unix.close fd ;
-    c_type
+    Tutils.finalize ~k:(fun () -> Unix.close fd)
+      (fun () ->
+         let decoder = Ogg_demuxer.init sync in
+         let feed ((buf,_),_) =
+           raise (Channels (Array.length buf))
+         in
+         let audio =
+           try
+             Ogg_demuxer.decode_audio_rec decoder feed;
+             raise Not_found
+           with
+             | Channels x -> x
+             | Not_found  -> 0
+         in
+         let feed (buf,_) =
+           raise (Channels 1)
+         in
+         let video =
+           try
+             Ogg_demuxer.decode_video_rec decoder feed;
+             raise Not_found
+           with
+             | Channels x -> x
+             | Not_found  -> 0
+         in
+           { Frame.
+             audio = audio ;
+             video = video ;
+             midi  = 0 })
 
 let () =

trunk/liquidsoap/src/formats/wavformat.ml

@@ -131 +131 @@
 let get_type filename =
   let chan = open_in filename in
-  let info = Wav.read_header chan filename in
-    close_in chan ;
-    { Frame. video = 0 ; midi = 0 ; audio = Wav.channels info }
+    Tutils.finalize
+      ~k:(fun () -> close_in chan)
+      (fun () ->
+         { Frame. video = 0 ; midi = 0 ;
+                  audio = Wav.channels (Wav.read_header chan filename) })
 
 let create_file_decoder filename kind =

trunk/liquidsoap/src/tools/tutils.ml

@@ -81 +81 @@
     with
       | e -> Mutex.unlock lock ; raise e
+
+let finalize ~k f =
+  try let x = f () in k () ; x with e -> k () ; raise e
 
 let seems_locked =

trunk/liquidsoap/src/tools/tutils.mli

@@ -64 +64 @@
 val mutexify : Mutex.t -> ('a -> 'b) -> ('a -> 'b)
 
+(** [finalize ~k f] calls [f] and returns it result,
+  * and always executes [k], even when [f] raises an exception. *)
+val finalize : k:(unit -> unit) -> (unit -> 'a) -> 'a
+
 (** Tests whether a mutex is locked, without blocking.
   * We cannot check on Win32, where [true] is always returned: