From 9051dc182c912c1df03cf1f06ce09d78d8a6ff40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Wed, 3 Oct 2007 19:06:42 +0000 Subject: [PATCH] * don't steal memory from bdb structures. --- citadel/citadel_dirs.h | 2 +- citadel/msgbase.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h index 1eb0a1138..16a4b6297 100644 --- a/citadel/citadel_dirs.h +++ b/citadel/citadel_dirs.h @@ -29,7 +29,7 @@ extern char ctdl_bbsbase_dir[PATH_MAX]; extern char ctdl_sbin_dir[PATH_MAX]; extern char ctdl_bin_dir[PATH_MAX]; extern char ctdl_utilbin_dir[PATH_MAX]; -extern char ctdl_key_dir[PATH_MAX]; + /* some of the frequently used files */ diff --git a/citadel/msgbase.c b/citadel/msgbase.c index b5732fe88..e4326851b 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -542,9 +542,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); if (cdbfr != NULL) { msglist = (long *) cdbfr->ptr; - cdbfr->ptr = NULL; /* CtdlForEachMessage() now owns this memory */ num_msgs = cdbfr->len / sizeof(long); - cdb_free(cdbfr); } else { if (need_to_free_re) regfree(&re); return 0; /* No messages at all? No further action. */ @@ -680,7 +678,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, ++num_processed; } } - free(msglist); /* Clean up */ + cdb_free(cdbfr); /* Clean up */ if (need_to_free_re) regfree(&re); return num_processed; } -- 2.39.2