1) strdup => DupString

2) Update debug_memleak_gc.patch to gc6.5(the latest).

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1435 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 1feda3b92610ad59ac0b461b4992fa2fcd77b209..ac5a6a5dc8712477c43ff8a419349cd4e16ddb77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-25  Andrew Miller  <a1kmm@amxl.com>
+
+       * ircd/ircd_crypt.c (ircd_crypt): strdup is not allowed, change to
+       DupStr so memdebug works.
+
+       * doc/debug_memleak_gc.patch : Update to gc6.5
+       
 2005-06-24  Andrew Miller  <a1kmm@amxl.com>
        * ircd/m_invite.c (m_invite): Don't propagate invites to local channels.
        

diff --git a/doc/debug_memleak_gc.patch b/doc/debug_memleak_gc.patch
index d4428d702e8d9cc012446079c706bd6ff6a65c67..aeae12864664f1cae161724daa015439669771d4 100644 (file)
--- a/doc/debug_memleak_gc.patch
+++ b/doc/debug_memleak_gc.patch
@@ -1,11 +1,7 @@
-The following patch has to be applied to Boehm gc6.0 from
-http://www.hpl.hp.com/personal/Hans_Boehm/gc/
-and you need to configure ircd with --with-leak-detect=path-to-gc6.0/.lib/
-
-diff -ru -x *.a -x *.so* -x *.o -x *.lo -x *.log -x *.*~ gc6.0/include/gc.h gc6.0-ircu/include/gc.h
---- gc6.0/include/gc.h Tue Jul 24 05:02:02 2001
-+++ gc6.0-ircu/include/gc.h    Sat Jun 29 21:04:40 2002
-@@ -722,6 +722,11 @@
+diff -rbud gc6.5/include/gc.h gc6.5.patched/include/gc.h
+--- gc6.5/include/gc.h Sat May 21 05:50:58 2005
++++ gc6.5.patched/include/gc.h Sat Jun 25 00:11:18 2005
+@@ -779,6 +779,11 @@
  GC_API GC_PTR GC_call_with_alloc_lock
                GC_PROTO((GC_fn_type fn, GC_PTR client_data));
  
@@ -16,46 +12,43 @@ diff -ru -x *.a -x *.so* -x *.o -x *.lo -x *.log -x *.*~ gc6.0/include/gc.h gc6.
 +
  /* The following routines are primarily intended for use with a       */
  /* preprocessor which inserts calls to check C pointer arithmetic.    */
+ /* They indicate failure by invoking the corresponding _print_proc.   */
+diff -rbud gc6.5/reclaim.c gc6.5.patched/reclaim.c
+--- gc6.5/reclaim.c    Tue Nov 23 06:58:18 2004
++++ gc6.5.patched/reclaim.c    Sat Jun 25 00:52:18 2005
+@@ -36,6 +36,14 @@
  
-diff -ru -x *.a -x *.so* -x *.o -x *.lo -x *.log -x *.*~ gc6.0/reclaim.c gc6.0-ircu/reclaim.c
---- gc6.0/reclaim.c    Tue Jun 12 10:21:28 2001
-+++ gc6.0-ircu/reclaim.c       Sat Jun 29 21:00:16 2002
-@@ -27,24 +27,23 @@
-       /* nonzero.                                                     */
- #endif /* PARALLEL_MARK */
+ GC_bool GC_have_errors = FALSE;
  
--static void report_leak(p, sz)
--ptr_t p;
--word sz;
-+void (*leak_handler)(void*, int);
++static void (*leak_handler)(void*, int);
 +
 +void
 +GC_set_leak_handler(void (*lh)(void*, int))
 +{
-+  leak_handler = lh;
++    leak_handler = lh;
 +}
 +
-+static void
-+report_leak(ptr_t p, word sz)
+ void GC_add_leaked(leaked)
+ ptr_t leaked;
  {
--    if (HDR(p) -> hb_obj_kind == PTRFREE) {
--        GC_err_printf0("Leaked atomic object at ");
--    } else {
--        GC_err_printf0("Leaked composite object at ");
--    }
--    GC_print_heap_obj(p);
--    GC_err_printf0("\n");
-+  if (leak_handler != NULL)
-+    leak_handler((void*)p, (int)sz);
- }
- 
--#   define FOUND_FREE(hblk, word_no) \
--      { \
--         report_leak((ptr_t)hblk + WORDS_TO_BYTES(word_no), \
--                   HDR(hblk) -> hb_sz); \
--      }
-+#define FOUND_FREE(hblk, word_no) \
-+  report_leak((ptr_t)hblk + WORDS_TO_BYTES(word_no), HDR(hblk)->hb_sz);
- 
- /*
-  * reclaim phase
+@@ -64,6 +72,12 @@
+     if (GC_debugging_started) GC_print_all_smashed();
+     for (i = 0; i < GC_n_leaked; ++i) {
+       ptr_t p = GC_leaked[i];
++        if (leak_handler)
++        {
++            leak_handler(GC_base(p), GC_size(GC_base(p)));
++        }
++        else
++        {
+       if (HDR(p) -> hb_obj_kind == PTRFREE) {
+           GC_err_printf0("Leaked atomic object at ");
+       } else {
+@@ -71,6 +85,7 @@
+       }
+       GC_print_heap_obj(p);
+       GC_err_printf0("\n");
++        }
+       GC_free(p);
+       GC_leaked[i] = 0;
+     }

diff --git a/ircd/ircd_crypt.c b/ircd/ircd_crypt.c
index 4f58e1dda5ad5c51ac396fa73ee0d817b6bb2ddd..2f50fe04856cb78f2e7064b16d07a0b14c663506 100644 (file)
--- a/ircd/ircd_crypt.c
+++ b/ircd/ircd_crypt.c
@@ -202,9 +202,13 @@ crypt_mechs_t* crypt_mech;
  /* try to use native crypt for an old-style (untagged) password */
  if (strlen(salt) > 2)
  {
+   char *s;
    temp_hashed_pass = (char*)ircd_crypt_native(key, salt);
    if (!ircd_strcmp(temp_hashed_pass, salt))
-    return strdup(temp_hashed_pass);
+   {
+     DupString(s, temp_hashed_pass);
+     return s;
+   }
  }
 
  return NULL;