X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=135b2084a2ef6a60381684a5d7e93e3bd352d439;hp=2c84b3275b2fe1ff69cafeb1bafc9172a83e99ce;hb=e22a8cad1bac2c28925823b91fa7099a411390e6;hpb=67c8e347acffd64dad57a89df9fd53cc17b7ea80 diff --git a/loaders.c b/loaders.c index 2c84b327..135b2084 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.102 2016/02/26 12:30:46 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.105 2016/05/25 10:50:55 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -74,7 +74,9 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION; static struct file_list *current_trustfile = NULL; #endif /* def FEATURE_TRUST */ +#ifndef FUZZ static int load_one_re_filterfile(struct client_state *csp, int fileid); +#endif static struct file_list *current_re_filterfile[MAX_AF_FILES] = { NULL, NULL, NULL, NULL, NULL, @@ -182,6 +184,10 @@ unsigned int sweep(void) last_active->next = client_list->next; freez(csp->ip_addr_str); +#ifdef FEATURE_CLIENT_TAGS + freez(csp->client_address); +#endif + freez(csp->listen_addr_str); freez(csp->client_iob->buf); freez(csp->iob->buf); freez(csp->error_message); @@ -357,6 +363,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline) for (;;) { ch = getc(fp); + if (ch == EOF) { if (len > 0) @@ -413,6 +420,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline) } else if (ch == 0) { + /* XXX: Why do we allow this anyway? */ *p = '\0'; *dest = buf; return JB_ERR_OK;