@@ -228,7 +228,7 @@ sfsistat clamfi_header(SMFICTX *ctx, char *headerf, char *headerv) {

     if(!cf->totsz && cf->all_whitelisted) {

 	logg("*Skipping scan (all destinations whitelisted)\n");

 	nullify(ctx, cf, CF_NONE);

-    free(cf);

+	free(cf);

 	return SMFIS_ACCEPT;

     }

@@ -260,32 +260,43 @@ sfsistat clamfi_header(SMFICTX *ctx, char *headerf, char *headerv) {

         free(cf);

         return ret;

     }

-    return sendchunk(cf, (unsigned char *)"\r\n", 2, ctx);

+    ret = sendchunk(cf, (unsigned char *)"\r\n", 2, ctx);

+    if(ret != SMFIS_CONTINUE)

+        free(cf);

+    return ret;

 }

 sfsistat clamfi_body(SMFICTX *ctx, unsigned char *bodyp, size_t len) {

     struct CLAMFI *cf;

+    sfsistat ret;

     if(!(cf = (struct CLAMFI *)smfi_getpriv(ctx)))

 	return SMFIS_CONTINUE; /* whatever */

     if(!cf->gotbody) {

-	sfsistat ret = sendchunk(cf, (unsigned char *)"\r\n", 2, ctx);

-	if(ret != SMFIS_CONTINUE)

+	ret = sendchunk(cf, (unsigned char *)"\r\n", 2, ctx);

+	if(ret != SMFIS_CONTINUE) {

+	    free(cf);

 	    return ret;

+        }

 	cf->gotbody = 1;

     }

-    return sendchunk(cf, bodyp, len, ctx);

+    ret = sendchunk(cf, bodyp, len, ctx);

+    if(ret != SMFIS_CONTINUE)

+	free(cf);

+    return ret;

 }

 sfsistat clamfi_abort(SMFICTX *ctx) {

     struct CLAMFI *cf;

-    if((cf = (struct CLAMFI *)smfi_getpriv(ctx)))

+    if((cf = (struct CLAMFI *)smfi_getpriv(ctx))) {

 	nullify(ctx, cf, CF_ANY);

+	free(cf);

+    }

     return SMFIS_CONTINUE;

 }

@@ -303,6 +314,7 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

 	logg("*Not scanning an empty message\n");

 	ret = CleanAction(ctx);

 	nullify(ctx, cf, CF_NONE);

+	free(cf);

 	return ret;

     }

@@ -312,6 +324,7 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

 	if(nc_sendmsg(cf->main, cf->alt) == -1) {

 	    logg("!FD send failed\n");

 	    nullify(ctx, cf, CF_ALT);

+	    free(cf);

 	    return FailAction;

 	}

     } else {

@@ -320,6 +333,7 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

 	if((cf->bufsz && nc_send(cf->main, &cf->sendme, cf->bufsz + 4)) || nc_send(cf->main, &sendmetoo, 4))  {

 	    logg("!Failed to flush STREAM\n");

 	    nullify(ctx, cf, CF_NONE);

+	    free(cf);

 	    return FailAction;

 	}

     }

@@ -334,6 +348,7 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

     if(!reply) {

 	logg("!No reply from clamd\n");

 	nullify(ctx, cf, CF_NONE);

+	free(cf);

 	return FailAction;

     }

@@ -468,7 +483,7 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

     }

     nullify(ctx, cf, CF_MAIN);

-

+    free(cf);

     free(reply);

     return ret;

 }

@@ -729,6 +744,7 @@ sfsistat clamfi_envrcpt(SMFICTX *ctx, char **argv) {

 	if(!new_rcpt) {

 	    logg("!Failed to allocate array for new recipient\n");

 	    nullify(ctx, cf, CF_ANY);

+	    free(cf);

 	    return FailAction;

 	}

 	cf->recipients = new_rcpt;

@@ -736,6 +752,7 @@ sfsistat clamfi_envrcpt(SMFICTX *ctx, char **argv) {

 	if(!(cf->recipients[rcpt_cnt] = strdup(argv[0]))) {

 	    logg("!Failed to allocate space for new recipient\n");

 	    nullify(ctx, cf, CF_ANY);

+	    free(cf);

 	    return FailAction;

 	}

     }