[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/04/01 23:19:21

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyOvernet.ml 

Log message:
        patch #5002

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.778&tr2=1.779&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml.diff?tr1=1.64&tr2=1.65&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.778 mldonkey/distrib/ChangeLog:1.779
--- mldonkey/distrib/ChangeLog:1.778    Fri Mar 31 12:47:08 2006
+++ mldonkey/distrib/ChangeLog  Sat Apr  1 23:19:21 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/04/02
+5002: Overnet: Fix Out of Memory Exception (zet)
+
 2006/03/31
 4997: Swarming: correctly create a new range when one is splitted (pango)
 
Index: mldonkey/src/networks/donkey/donkeyOvernet.ml
diff -u mldonkey/src/networks/donkey/donkeyOvernet.ml:1.64 
mldonkey/src/networks/donkey/donkeyOvernet.ml:1.65
--- mldonkey/src/networks/donkey/donkeyOvernet.ml:1.64  Wed Mar 29 14:22:08 2006
+++ mldonkey/src/networks/donkey/donkeyOvernet.ml       Sat Apr  1 23:19:21 2006
@@ -275,6 +275,20 @@
 | KeywordSearch of CommonTypes.search
 | FillBuckets
 
+(* using "=" to structurally compare files (-> search_fors) 
+   will result in an OutOfMemory exception *)
+let search_for_equals sf1 sf2 =
+  match sf1 with 
+    | FileSearch f1 -> 
+      (match sf2 with 
+        | FileSearch f2 when f1 == f2 -> true
+        | _ -> false)
+    | KeywordSearch k1 ->
+      (match sf2 with
+        | KeywordSearch k2 when k1 == k2 -> true
+        | _ -> false)
+    | _ -> true
+
 type overnet_search = {
     search_md4 : Md4.t;
     mutable search_kind : search_for;
@@ -951,7 +965,7 @@
       search_results = Hashtbl.create 64;
     } in
   List.iter (fun ss ->
-    if ss.search_md4 = !s.search_md4 && ss.search_kind = !s.search_kind then 
begin
+    if ss.search_md4 = !s.search_md4 && (search_for_equals ss.search_kind 
!s.search_kind) then begin
      ss.search_start <- !s.search_start;
      s := ss;
     end