clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix bug #55622, better fix for this issue, old fix can break if sizeof(size_t) > sizeof(int) like on sparc

Browse Source
This commit is contained in:
Pierre Joye 2011-09-26 08:36:33 +00:00
parent f50f54a6ea
commit 60bf324ed5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/standard/basic_functions.c
View File

@ -3989,7 +3989,13 @@ PHP_FUNCTION(getenv)
ptr = emalloc(size);
size = GetEnvironmentVariableA(str, ptr, size);
RETURN_STRING(ptr, 0);
if (size == 0) {
/* has been removed between the two calls */
efree(ptr);
RETURN_EMPTY_STRING();
} else {
RETURN_STRING(ptr, 0);
}
}
#else
/* system method returns a const */
@ -5930,7 +5936,7 @@ PHP_FUNCTION(parse_ini_file)
PHP_FUNCTION(parse_ini_string)
{
char *string = NULL, *str = NULL;
size_t str_len = 0;
int str_len = 0;
zend_bool process_sections = 0;
long scanner_mode = ZEND_INI_SCANNER_NORMAL;
zend_ini_parser_cb_t ini_parser_cb;
@ -5939,6 +5945,10 @@ PHP_FUNCTION(parse_ini_string)
RETURN_FALSE;
}
if (INT_MAX - str_len < ZEND_MMAP_AHEAD) {
RETVAL_FALSE;
}
/* Set callback function */
if (process_sections) {
BG(active_ini_file_section) = NULL;