[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/cdk/bzip2....

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/05 10:41:06

Modified files:
        distrib        : ChangeLog 
        src/utils/cdk  : bzip2.ml gzip.ml 

Log message:
        patch #4949

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.757&tr2=1.758&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/bzip2.ml.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/gzip.ml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.757 mldonkey/distrib/ChangeLog:1.758
--- mldonkey/distrib/ChangeLog:1.757    Sun Mar  5 10:40:04 2006
+++ mldonkey/distrib/ChangeLog  Sun Mar  5 10:41:06 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/03/05
+4949: Gzip/Bzip2: Close opened FD after opening an invalid archive file
 4945: BT: Automatically start new torrents downloads
 - new directory $MLDONKEY_DIR/torrents/incoming, all files present
   in this dir are started automatically, its scanned every 10 seconds.
Index: mldonkey/src/utils/cdk/bzip2.ml
diff -u mldonkey/src/utils/cdk/bzip2.ml:1.4 mldonkey/src/utils/cdk/bzip2.ml:1.5
--- mldonkey/src/utils/cdk/bzip2.ml:1.4 Sat Nov 19 17:19:45 2005
+++ mldonkey/src/utils/cdk/bzip2.ml     Sun Mar  5 10:41:06 2006
@@ -24,7 +24,10 @@
     in_size = Int32.zero }
 
 let open_in filename =
-  open_in_chan (Pervasives.open_in_bin filename)
+  let ic = Pervasives.open_in_bin filename in
+  try
+    open_in_chan ic
+  with e -> Pervasives.close_in ic; raise e
 
 let read_byte iz =
   if iz.in_avail = 0 then begin
Index: mldonkey/src/utils/cdk/gzip.ml
diff -u mldonkey/src/utils/cdk/gzip.ml:1.1 mldonkey/src/utils/cdk/gzip.ml:1.2
--- mldonkey/src/utils/cdk/gzip.ml:1.1  Sat Jul 23 14:19:48 2005
+++ mldonkey/src/utils/cdk/gzip.ml      Sun Mar  5 10:41:06 2006
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: gzip.ml,v 1.1 2005/07/23 14:19:48 spiralvoice Exp $ *)
+(* $Id: gzip.ml,v 1.2 2006/03/05 10:41:06 spiralvoice Exp $ *)
 
 (* Module [Gzip]: reading and writing to/from [gzip] compressed files *)
 
@@ -73,7 +73,10 @@
     in_crc = Int32.zero }
 
 let open_in filename =
-  open_in_chan (Pervasives.open_in_bin filename)
+  let ic = Pervasives.open_in_bin filename in
+  try
+    open_in_chan ic
+  with e -> Pervasives.close_in ic; raise e
 
 let read_byte iz =
   if iz.in_avail = 0 then begin