X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdatabase.c;h=cdc732cdc8082e90d197d861bdc35889c549942f;hb=3ce9f3fc5eb5103ea9805d9d3476a1a3a52bf481;hp=0da1f0f19ab72ee86b75f13e90a78fdd9bdc2719;hpb=59b2f220e65fc35ebf26253ea716f4be623b9065;p=citadel.git

diff --git a/citadel/database.c b/citadel/database.c
index 0da1f0f19..cdc732cdc 100644
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -725,12 +725,15 @@ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen)
 	if (tempcdb == NULL) {
 		syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
 		cdb_abort();
+		return NULL; /* make it easier for static analysis... */
+	}
+	else
+	{
+		tempcdb->len = dret.size;
+		tempcdb->ptr = dret.data;
+		cdb_decompress_if_necessary(tempcdb);
+		return (tempcdb);
 	}
-
-	tempcdb->len = dret.size;
-	tempcdb->ptr = dret.data;
-	cdb_decompress_if_necessary(tempcdb);
-	return (tempcdb);
 }
 
 
@@ -770,7 +773,7 @@ void cdb_rewind(int cdb)
 
 	if (TSD->cursors[cdb] != NULL) {
 		syslog(LOG_EMERG,
-			"cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
+		       "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
 		cdb_abort();
 		/* cclose(TSD->cursors[cdb]); */
 	}