-const char loaders_rcs[] = "$Id: loaders.c,v 1.50.2.8 2006/01/30 15:16:25 david__schmidt Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.56 2006/09/07 10:40:30 fabiankeil Exp $";
/*********************************************************************
*
- * File : $Source: /cvsroot/ijbswa/current/Attic/loaders.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
*
* Purpose : Functions to load and unload the various
* configuration files. Also contains code to manage
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.56 2006/09/07 10:40:30 fabiankeil
+ * Turns out trusted referrers above our arbitrary
+ * limit are downgraded too ordinary trusted URLs.
+ * Adjusted error message.
+ *
+ * Revision 1.55 2006/09/07 10:25:39 fabiankeil
+ * Fix typo.
+ *
+ * Revision 1.54 2006/09/07 10:22:20 fabiankeil
+ * If too many trusted referrers are used,
+ * print only one error message instead of logging
+ * every single trusted referrer above the arbitrary
+ * limit.
+ *
+ * Revision 1.53 2006/08/31 16:25:06 fabiankeil
+ * Work around a buffer overflow that caused Privoxy to
+ * segfault if too many trusted referrers were used. Good
+ * enough for now, but should be replaced with a real
+ * solution after the next release.
+ *
+ * Revision 1.52 2006/07/18 14:48:46 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
* Revision 1.50.2.8 2006/01/30 15:16:25 david__schmidt
* Remove a little residual debugging info
*
#include "errlog.h"
#include "actions.h"
#include "urlmatch.h"
+#include "encode.h"
const char loaders_h_rcs[] = LOADERS_H_VERSION;
int reject, trusted;
struct file_list *fs;
unsigned long linenum = 0;
+ int trusted_referrers = 0;
if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs))
{
*/
if (trusted)
{
- *tl++ = b->url;
- /* FIXME BUFFER OVERFLOW if >=64 entries */
+ if(++trusted_referrers < MAX_TRUSTED_REFERRERS)
+ {
+ *tl++ = b->url;
+ }
}
}
+ if(trusted_referrers >= MAX_TRUSTED_REFERRERS)
+ {
+ /*
+ * FIXME: ... after Privoxy 3.0.4 is out.
+ */
+ log_error(LOG_LEVEL_ERROR, "Too many trusted referrers. Current limit is %d, you are using %d.\n"
+ " Additional trusted referrers are treated like ordinary trusted URLs.\n"
+ " (You can increase this limit by changing MAX_TRUSTED_REFERRERS in project.h and recompiling).",
+ MAX_TRUSTED_REFERRERS, trusted_referrers);
+ }
+
*tl = NULL;
fclose(fp);
new_bl->name = chomp(buf + 7);
+ /*
+ * If a filter description is available,
+ * encode it to HTML and save it.
+ */
if (NULL != (new_bl->description = strpbrk(new_bl->name, " \t")))
{
*new_bl->description++ = '\0';
- new_bl->description = strdup(chomp(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");
+ }
}
else
{
}
else
{
- log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d", buf, csp->config->re_filterfile, linenum);
+ log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d",
+ buf, csp->config->re_filterfile[fileid], linenum);
}
}