X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdatabase.c;h=3f5123f0189b7ed2334fff56b92ce7d2cf096e71;hb=1493fd8ff0de73d30336607b43b1c8113ffcffa2;hp=23e7133516c3926697a4bda48a17fe9c0d0c2799;hpb=655de5af64c89584fbdd0110a27053a9f3bfd138;p=citadel.git diff --git a/citadel/database.c b/citadel/database.c index 23e713351..3f5123f01 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -889,8 +889,8 @@ int SeentDebugEnabled = 0; #define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SeentDebugEnabled != 0)) #define SEENM_syslog(LEVEL, FORMAT) \ DBGLOG(LEVEL) syslog(LEVEL, \ - "IO[%ld]CC[%ld] SEEN[%s][%d] " FORMAT, \ - ioid, ccid, Facility, cType) + "%s[%ld]CC[%ld] SEEN[%s][%d] " FORMAT, \ + IOSTR, ioid, ccid, Facility, cType) time_t CheckIfAlreadySeen(const char *Facility, StrBuf *guid, @@ -908,7 +908,7 @@ time_t CheckIfAlreadySeen(const char *Facility, { SEENM_syslog(LOG_DEBUG, "Loading"); cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid)); - if (cdbut != NULL) { + if ((cdbut != NULL) && (cdbut->ptr != NULL)) { memcpy(&ut, cdbut->ptr, ((cdbut->len > sizeof(struct UseTable)) ? sizeof(struct UseTable) : cdbut->len)); @@ -929,6 +929,8 @@ time_t CheckIfAlreadySeen(const char *Facility, } else { + if (cdbut) cdb_free(cdbut); + SEENM_syslog(LOG_DEBUG, "not Found"); }