summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorStefan Esser <sesser@php.net>2003-11-03 09:16:24 +0000
committerStefan Esser <sesser@php.net>2003-11-03 09:16:24 +0000
commitf670f9c68367d3d6917e76abf314ec9f325f759a (patch)
treebe32043c12b519f39137b0830b4a57be4755eb32 /main
parentab676c88dc3af7ea2f5afa4de768e39e4fb736e1 (diff)
downloadphp-git-f670f9c68367d3d6917e76abf314ec9f325f759a.tar.gz
It is usually a good idea to write only into allocated bufferspace.
Diffstat (limited to 'main')
-rw-r--r--main/rfc1867.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 57b0e9ae93..3c1a21c82e 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -78,8 +78,8 @@ void php_mb_gpc_stack_variable(char *param, char *value, char ***pval_list, int
if (*num_vars>=*num_vars_max){
(*num_vars_max) += 16;
- *pval_list = (char **)erealloc(val_list, *num_vars_max*sizeof(char *));
- *plen_list = (int *)erealloc(len_list, *num_vars_max*sizeof(int));
+ *pval_list = (char **)erealloc(val_list, (*num_vars_max+2)*sizeof(char *));
+ *plen_list = (int *)erealloc(len_list, (*num_vars_max+2)*sizeof(int));
val_list=*pval_list;
len_list=*plen_list;
}
@@ -755,7 +755,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
int max_file_size=0, skip_upload=0, anonindex=0, is_anonymous;
zval *http_post_files=NULL;
#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
- int str_len = 0, num_vars = 0, num_vars_max = 2*10+1, *len_list = NULL;
+ int str_len = 0, num_vars = 0, num_vars_max = 2*10, *len_list = NULL;
char **val_list = NULL;
#endif
zend_bool magic_quotes_gpc;
@@ -814,8 +814,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
if (php_mb_encoding_translation(TSRMLS_C)) {
- val_list = (char **)ecalloc(num_vars_max, sizeof(char *));
- len_list = (int *)ecalloc(num_vars_max, sizeof(int));
+ val_list = (char **)ecalloc(num_vars_max+2, sizeof(char *));
+ len_list = (int *)ecalloc(num_vars_max+2, sizeof(int));
}
#endif
zend_llist_init(&header, sizeof(mime_header_entry), (llist_dtor_func_t) php_free_hdr_entry, 0);