diff options
| author | Anatol Belski <ab@php.net> | 2013-10-30 20:13:14 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-10-30 20:13:14 +0100 |
| commit | fc707a27ff1ede5494318e9d0eafd0ebb87d1d2e (patch) | |
| tree | 0a6393c9b0ef9ff9760853e6c45a98365c916d5f /main | |
| parent | e17de5e9fd1f25626a6f8bf71a1ad882ac567fa6 (diff) | |
| download | php-git-fc707a27ff1ede5494318e9d0eafd0ebb87d1d2e.tar.gz | |
back to do_alloca(), reverted the wrong replacement
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index 2d018a7467..bd5e91b230 100644 --- a/main/main.c +++ b/main/main.c @@ -2412,13 +2412,14 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) volatile int old_cwd_fd = -1; #else char *old_cwd; + ALLOCA_FLAG(use_heap) #endif int retval = 0; EG(exit_status) = 0; #ifndef HAVE_BROKEN_GETCWD # define OLD_CWD_SIZE 4096 - old_cwd = emalloc(OLD_CWD_SIZE); + old_cwd = do_alloca(OLD_CWD_SIZE, use_heap); old_cwd[0] = '\0'; #endif @@ -2499,7 +2500,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) if (old_cwd[0] != '\0') { php_ignore_value(VCWD_CHDIR(old_cwd)); } - efree(old_cwd); + do_alloca(old_cwd, use_heap); #endif return retval; } |