projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc/webserver/config/index.php: Remove obsolete section about 'new' web interface...
[privoxy.git]
/
cgisimple.c
diff --git
a/cgisimple.c
b/cgisimple.c
index
4a93dc7
..
f3dfc8f
100644
(file)
--- a/
cgisimple.c
+++ b/
cgisimple.c
@@
-1,4
+1,4
@@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.1
29 2014/10/18 11:25
:13 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.1
32 2015/11/06 13:38
:13 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@
-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)
#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
&& (NULL != csp->config->actions_file_short[i]))
{
#ifdef HAVE_ACCESS
@@
-1914,6
+1913,7
@@
static jb_err cgi_show_file(struct client_state *csp,
s = html_encode_and_free_original(s);
if (NULL == s)
{
s = html_encode_and_free_original(s);
if (NULL == s)
{
+ free_map(exports);
return JB_ERR_MEMORY;
}
return JB_ERR_MEMORY;
}
@@
-1985,12
+1985,9
@@
static jb_err load_file(const char *filename, char **buffer, size_t *length)
filename);
}
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
{
/*
* May theoretically happen if the file size changes between