projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify template_fill_for_cgi()
[privoxy.git]
/
loaders.c
diff --git
a/loaders.c
b/loaders.c
index
6cb641e
..
135b208
100644
(file)
--- a/
loaders.c
+++ b/
loaders.c
@@
-1,4
+1,4
@@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.
98 2014/06/02 06:19:06
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 $
/*********************************************************************
*
* 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 */
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);
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,
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);
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);
freez(csp->client_iob->buf);
freez(csp->iob->buf);
freez(csp->error_message);
@@
-288,15
+294,8
@@
int check_file_changed(const struct file_list * current,
return 0;
}
return 0;
}
- fs = (struct file_list *)zalloc(sizeof(struct file_list));
- if (fs == NULL)
- {
- /* Out of memory error */
- return 1;
- }
-
-
- fs->filename = strdup(filename);
+ fs = zalloc_or_die(sizeof(struct file_list));
+ fs->filename = strdup_or_die(filename);
fs->lastmodified = statbuf->st_mtime;
if (fs->filename == NULL)
fs->lastmodified = statbuf->st_mtime;
if (fs->filename == NULL)
@@
-364,6
+363,7
@@
jb_err simple_read_line(FILE *fp, char **dest, int *newline)
for (;;)
{
ch = getc(fp);
for (;;)
{
ch = getc(fp);
+
if (ch == EOF)
{
if (len > 0)
if (ch == EOF)
{
if (len > 0)
@@
-420,6
+420,7
@@
jb_err simple_read_line(FILE *fp, char **dest, int *newline)
}
else if (ch == 0)
{
}
else if (ch == 0)
{
+ /* XXX: Why do we allow this anyway? */
*p = '\0';
*dest = buf;
return JB_ERR_OK;
*p = '\0';
*dest = buf;
return JB_ERR_OK;
@@
-537,30
+538,15
@@
jb_err edit_read_line(FILE *fp,
if (raw_out)
{
if (raw_out)
{
- raw = strdup("");
- if (NULL == raw)
- {
- return JB_ERR_MEMORY;
- }
+ raw = strdup_or_die("");
}
if (prefix_out)
{
}
if (prefix_out)
{
- prefix = strdup("");
- if (NULL == prefix)
- {
- freez(raw);
- return JB_ERR_MEMORY;
- }
+ prefix = strdup_or_die("");
}
if (data_out)
{
}
if (data_out)
{
- data = strdup("");
- if (NULL == data)
- {
- freez(raw);
- freez(prefix);
- return JB_ERR_MEMORY;
- }
+ data = strdup_or_die("");
}
/* Main loop. Loop while we need more data & it's not EOF. */
}
/* Main loop. Loop while we need more data & it's not EOF. */
@@
-652,15
+638,12
@@
jb_err edit_read_line(FILE *fp,
if (*linestart)
{
is_empty = 0;
if (*linestart)
{
is_empty = 0;
- if (
data
)
+ if (
string_append(&data, linestart)
)
{
{
- if (string_append(&data, linestart))
- {
- freez(raw);
- freez(prefix);
- free(linebuf);
- return JB_ERR_MEMORY;
- }
+ freez(raw);
+ freez(prefix);
+ free(linebuf);
+ return JB_ERR_MEMORY;
}
}
}
}
@@
-848,11
+831,7
@@
int load_trustfile(struct client_state *csp)
goto load_trustfile_error;
}
goto load_trustfile_error;
}
- fs->f = bl = (struct block_spec *)zalloc(sizeof(*bl));
- if (bl == NULL)
- {
- goto load_trustfile_error;
- }
+ fs->f = bl = zalloc_or_die(sizeof(*bl));
if ((fp = fopen(csp->config->trustfile, "r")) == NULL)
{
if ((fp = fopen(csp->config->trustfile, "r")) == NULL)
{
@@
-895,11
+874,7
@@
int load_trustfile(struct client_state *csp)
}
/* allocate a new node */
}
/* allocate a new node */
- if ((b = zalloc(sizeof(*b))) == NULL)
- {
- fclose(fp);
- goto load_trustfile_error;
- }
+ b = zalloc_or_die(sizeof(*b));
/* add it to the list */
b->next = bl->next;
/* add it to the list */
b->next = bl->next;
@@
-1183,11
+1158,7
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
*/
if (new_filter != FT_INVALID_FILTER)
{
*/
if (new_filter != FT_INVALID_FILTER)
{
- new_bl = (struct re_filterfile_spec *)zalloc(sizeof(*bl));
- if (new_bl == NULL)
- {
- goto load_re_filterfile_error;
- }
+ new_bl = zalloc_or_die(sizeof(*bl));
if (new_filter == FT_CONTENT_FILTER)
{
new_bl->name = chomp(buf + 7);
if (new_filter == FT_CONTENT_FILTER)
{
new_bl->name = chomp(buf + 7);
@@
-1214,15
+1185,16
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
new_bl->description = html_encode(chomp(new_bl->description));
if (NULL == new_bl->description)
{
new_bl->description = html_encode(chomp(new_bl->description));
if (NULL == new_bl->description)
{
- new_bl->description = strdup("Out of memory while encoding this filter's description to HTML");
+ new_bl->description = strdup_or_die("Out of memory while "
+ "encoding filter description to HTML");
}
}
else
{
}
}
else
{
- new_bl->description = strdup
("No description available for this filter
");
+ new_bl->description = strdup
_or_die("No description available
");
}
}
- new_bl->name = strdup(chomp(new_bl->name));
+ new_bl->name = strdup
_or_die
(chomp(new_bl->name));
/*
* If this is the first filter block, chain it
/*
* If this is the first filter block, chain it
@@
-1314,7
+1286,8
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
if ((dummy = pcrs_compile_command(buf, &error)) == NULL)
{
log_error(LOG_LEVEL_ERROR,
if ((dummy = pcrs_compile_command(buf, &error)) == NULL)
{
log_error(LOG_LEVEL_ERROR,
- "Adding re_filter job \'%s\' to filter %s failed with error %d.", buf, bl->name, error);
+ "Adding re_filter job \'%s\' to filter %s failed: %s",
+ buf, bl->name, pcrs_strerror(error));
freez(buf);
continue;
}
freez(buf);
continue;
}