X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=e4e01e77ee035a86fc6dd4135c4d82c6cc1b3ebe;hp=f720ea833e146ba6c97a683d9c87f3f5061f0ee0;hb=76854d3d47c7d1b050ed9c8a1f3bb429e1396e27;hpb=0ac93da66a0f3071b62c350bd0f1367cecd4e704
diff --git a/cgisimple.c b/cgisimple.c
index f720ea83..e4e01e77 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.130 2014/10/18 11:26:31 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.133 2016/02/26 12:29:38 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -178,7 +178,7 @@ jb_err cgi_die (struct client_state *csp,
"\n"
" Privoxy shutdown request received\n"
" \n"
- " \n"
+ " \n"
"\n"
"\n"
"Privoxy shutdown request received
\n"
@@ -970,7 +970,6 @@ jb_err cgi_show_status(struct client_state *csp,
#ifdef FEATURE_CGI_EDIT_ACTIONS
if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS)
- && (NULL == strstr(csp->actions_list[i]->filename, "standard.action"))
&& (NULL != csp->config->actions_file_short[i]))
{
#ifdef HAVE_ACCESS
@@ -1986,12 +1985,9 @@ static jb_err load_file(const char *filename, char **buffer, size_t *length)
filename);
}
- *buffer = (char *)zalloc(*length + 1);
- if (NULL == *buffer)
- {
- err = JB_ERR_MEMORY;
- }
- else if (1 != fread(*buffer, *length, 1, fp))
+ *buffer = zalloc_or_die(*length + 1);
+
+ if (1 != fread(*buffer, *length, 1, fp))
{
/*
* May theoretically happen if the file size changes between