github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-17 01:36:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix curl callback function

Browse Source
This commit is contained in:
Felipe Zimmerle 2018-12-14 23:53:05 -03:00
parent c08d3edb13
commit 52532a1bce
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache2/msc_util.c
View File

@ -2780,8 +2780,8 @@ int ip_tree_from_param(apr_pool_t *mp,
} }
#ifdef WITH_CURL #ifdef WITH_CURL
size_t msc_curl_write_memory_cb(apr_pool_t *mp, void *contents, size_t size, size_t msc_curl_write_memory_cb(void *contents, size_t size,
size_t nmemb, void *userp, char **error_msg) size_t nmemb, void *userp)
{ {
size_t realsize = size * nmemb; size_t realsize = size * nmemb;
struct msc_curl_memory_buffer_t *mem = (struct msc_curl_memory_buffer_t *)userp; struct msc_curl_memory_buffer_t *mem = (struct msc_curl_memory_buffer_t *)userp;
@ -2790,19 +2790,13 @@ size_t msc_curl_write_memory_cb(apr_pool_t *mp, void *contents, size_t size,
{ {
mem->memory = malloc(realsize + 1); mem->memory = malloc(realsize + 1);
if (mem->memory == NULL) { if (mem->memory == NULL) {
*error_msg = apr_psprintf(mp, "Unable to allocate buffer for mem->memory");
return 0; return 0;
} }
memset(mem->memory, '\0', sizeof(realsize + 1)); memset(mem->memory, '\0', sizeof(realsize + 1));
} }
else else
{ {
void *tmp; mem->memory = realloc(mem->memory, mem->size + realsize + 1);
tmp = mem->memory;
tmp = realloc(mem->memory, mem->size + realsize + 1);
if (tmp != NULL) {
mem->memory = tmp;
}
memset(mem->memory + mem->size, '\0', sizeof(realsize + 1)); memset(mem->memory + mem->size, '\0', sizeof(realsize + 1));
} }

4
apache2/msc_util.h
View File

@ -166,8 +166,8 @@ int ip_tree_from_uri(TreeRoot **rtree, char *uri,
int read_line(char *buff, int size, FILE *fp); int read_line(char *buff, int size, FILE *fp);
size_t msc_curl_write_memory_cb(apr_pool_t *mp, void *contents, size_t size, size_t msc_curl_write_memory_cb(void *contents, size_t size,
size_t nmemb, void *userp, char **error_msg); size_t nmemb, void *userp);
struct msc_curl_memory_buffer_t struct msc_curl_memory_buffer_t
{ {