From: Wilfried Goesgens Date: Sat, 28 Sep 2013 16:48:36 +0000 (+0200) Subject: Make realy shure we don't put a NULL into memcpy X-Git-Tag: v8.22~13 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=18de56c1f03b77b9ca98e0dd2cd0b9c4888f6a40 Make realy shure we don't put a NULL into memcpy --- diff --git a/citadel/database.c b/citadel/database.c index b3a67d69b..d9080a5d7 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -931,7 +931,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));