diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-27 12:41:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-27 14:20:30 +0200 |
| commit | 2149ed7072052fcab3baed72e82e26225845589b (patch) | |
| tree | 854b37364b617bb0c2e846eb739f66dcde9fd128 | |
| parent | 78375aa52f1f2ae79e2d014f24e15b48ef72bea7 (diff) | |
| download | php-git-2149ed7072052fcab3baed72e82e26225845589b.tar.gz | |
Don't use zmm for PHPDBG_G(exec)
Uses system allocator when backing up settings ... let's avoid
unnecessary confusion.
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 8 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 6a684718b4..d334870f7e 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -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) { diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index f2f20ae75b..81962b39ee 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -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; diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 38e3d38377..857b5e3311 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -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) /* {{{ */ |