From: Wilfried Goesgens Date: Thu, 31 May 2012 21:43:32 +0000 (+0200) Subject: when failing by OOM, don't loose any more memory. X-Git-Tag: v8.12~45 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=ca4f48f24ef79b27dd0e8b539604e7789530e07f when failing by OOM, don't loose any more memory. --- diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 706230774..a1acc98c4 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -2753,6 +2753,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms msglist = realloc(msglist, (sizeof(long) * (num_msgs + num_msgs_to_be_merged)) ); if (msglist == NULL) { MSGM_syslog(LOG_ALERT, "ERROR: can't realloc message list!\n"); + free(msgs_to_be_merged); return (ERROR + INTERNAL_ERROR); } memcpy(&msglist[num_msgs], msgs_to_be_merged, (sizeof(long) * num_msgs_to_be_merged) );