archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't use zmm for PHPDBG_G(exec)

Browse source 
Uses system allocator when backing up settings ... let's avoid
unnecessary confusion.
This commit is contained in:
Nikita Popov 2019-06-27 12:41:41 +02:00
parent 78375aa52f
commit 2149ed7072
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sapi/phpdbg/phpdbg.c
View file

@ -249,7 +249,7 @@ static PHP_MSHUTDOWN_FUNCTION(phpdbg) /* {{{ */
}
if (PHPDBG_G(exec)) {
efree(PHPDBG_G(exec));
free(PHPDBG_G(exec));
PHPDBG_G(exec) = NULL;
}
@ -325,11 +325,11 @@ static PHP_FUNCTION(phpdbg_exec)
if (sb.st_mode & (S_IFREG|S_IFLNK)) {
if (PHPDBG_G(exec)) {
ZVAL_STRINGL(return_value, PHPDBG_G(exec), PHPDBG_G(exec_len));
efree(PHPDBG_G(exec));
free(PHPDBG_G(exec));
result = 0;
}
PHPDBG_G(exec) = estrndup(ZSTR_VAL(exec), ZSTR_LEN(exec));
PHPDBG_G(exec) = strndup(ZSTR_VAL(exec), ZSTR_LEN(exec));
PHPDBG_G(exec_len) = ZSTR_LEN(exec);
if (result) {

8
sapi/phpdbg/phpdbg_prompt.c
View file

@ -421,7 +421,7 @@ PHPDBG_COMMAND(exec) /* {{{ */
if (PHPDBG_G(exec)) {
phpdbg_notice("exec", "type=\"unset\" context=\"%s\"", "Unsetting old execution context: %s", PHPDBG_G(exec));
efree(PHPDBG_G(exec));
free(PHPDBG_G(exec));
PHPDBG_G(exec) = NULL;
PHPDBG_G(exec_len) = 0L;
}
@ -436,7 +436,7 @@ PHPDBG_COMMAND(exec) /* {{{ */
VCWD_CHDIR_FILE(res);
*SG(request_info).argv = PHPDBG_G(exec);
*SG(request_info).argv = estrndup(PHPDBG_G(exec), PHPDBG_G(exec_len));
php_build_argv(NULL, &PG(http_globals)[TRACK_VARS_SERVER]);
phpdbg_notice("exec", "type=\"set\" context=\"%s\"", "Set execution context: %s", PHPDBG_G(exec));
@ -534,9 +534,9 @@ int phpdbg_compile_stdin(zend_string *code) {
}
if (PHPDBG_G(exec)) {
efree(PHPDBG_G(exec));
free(PHPDBG_G(exec));
}
PHPDBG_G(exec) = estrdup("Standard input code");
PHPDBG_G(exec) = strdup("Standard input code");
PHPDBG_G(exec_len) = sizeof("Standard input code") - 1;
{ /* remove leading ?> from source */
int i;

2
sapi/phpdbg/phpdbg_utils.c
View file

@ -154,7 +154,7 @@ PHPDBG_API char *phpdbg_resolve_path(const char *path) /* {{{ */
return NULL;
}
return estrdup(resolved_name);
return strdup(resolved_name);
} /* }}} */
PHPDBG_API const char *phpdbg_current_file(void) /* {{{ */