You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@spamassassin.apache.org by Ondřej Lysoněk <ol...@redhat.com> on 2018/10/02 14:50:54 UTC

[PATCH] Fix file handle leaks

This applies both to 3.4 and trunk.

---
 spamc/spamc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spamc/spamc.c b/spamc/spamc.c
index 38a7df5..8702cfe 100644
--- a/spamc/spamc.c
+++ b/spamc/spamc.c
@@ -616,6 +616,7 @@ combine_args(char *config_file, int argc, char **argv,
 	        fprintf(stderr,"Exceeded max line size (%d) in %s\n",
                         CONFIG_MAX_LINE_SIZE-2, config_file);
 	    }
+	    fclose(config);
 	    return EX_CONFIG;
 	}
 
@@ -629,6 +630,7 @@ combine_args(char *config_file, int argc, char **argv,
             if (*combo_argc >= COMBO_ARGV_SIZE) {
 	        fprintf(stderr,"Exceeded max number of arguments (%d) in %s\n",
 	                COMBO_ARGV_SIZE, config_file);
+	        fclose(config);
 	        return EX_CONFIG;
             }
             combo_argv[*combo_argc] = strdup(tok);
-- 
2.17.1


Re: [PATCH] Fix file handle leaks

Posted by "Kevin A. McGrail" <km...@apache.org>.
Thanks.  good catch.  I'll get it in a bug.

On 10/2/2018 10:50 AM, Ondřej Lysoněk wrote:
> This applies both to 3.4 and trunk.
>
> ---
>  spamc/spamc.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/spamc/spamc.c b/spamc/spamc.c
> index 38a7df5..8702cfe 100644
> --- a/spamc/spamc.c
> +++ b/spamc/spamc.c
> @@ -616,6 +616,7 @@ combine_args(char *config_file, int argc, char **argv,
>  	        fprintf(stderr,"Exceeded max line size (%d) in %s\n",
>                          CONFIG_MAX_LINE_SIZE-2, config_file);
>  	    }
> +	    fclose(config);
>  	    return EX_CONFIG;
>  	}
>  
> @@ -629,6 +630,7 @@ combine_args(char *config_file, int argc, char **argv,
>              if (*combo_argc >= COMBO_ARGV_SIZE) {
>  	        fprintf(stderr,"Exceeded max number of arguments (%d) in %s\n",
>  	                COMBO_ARGV_SIZE, config_file);
> +	        fclose(config);
>  	        return EX_CONFIG;
>              }
>              combo_argv[*combo_argc] = strdup(tok);


-- 
Kevin A. McGrail
VP Fundraising, Apache Software Foundation
Chair Emeritus Apache SpamAssassin Project
https://www.linkedin.com/in/kmcgrail - 703.798.0171