diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-05-13 09:43:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-05-13 09:43:05 +0300 |
| commit | f69b30eaae19e9636c56971e48603ff1be785725 (patch) | |
| tree | 742a02f6f599188a9d64cd6f2517ef8d2509872f | |
| parent | 5a1bef8eef07881f8620c4521fcd108e75e4728d (diff) | |
| download | php-git-f69b30eaae19e9636c56971e48603ff1be785725.tar.gz | |
Partial revert of 6a819bba40661a9a8d7080994cb2f24b73c5d46c.
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | main/main.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 50dcab718a..462a234205 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4740,11 +4740,11 @@ PHP_FUNCTION(error_clear_last) PG(last_error_type) = 0; PG(last_error_lineno) = 0; - efree(PG(last_error_message)); + free(PG(last_error_message)); PG(last_error_message) = NULL; if (PG(last_error_file)) { - efree(PG(last_error_file)); + free(PG(last_error_file)); PG(last_error_file) = NULL; } } diff --git a/main/main.c b/main/main.c index 37f4d9c238..ebaaa2a8e4 100644 --- a/main/main.c +++ b/main/main.c @@ -990,11 +990,11 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ HANDLE_BLOCK_INTERRUPTIONS(); #endif if (PG(last_error_message)) { - efree(PG(last_error_message)); + free(PG(last_error_message)); PG(last_error_message) = NULL; } if (PG(last_error_file)) { - efree(PG(last_error_file)); + free(PG(last_error_file)); PG(last_error_file) = NULL; } #ifdef ZEND_SIGNALS @@ -1004,8 +1004,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_ error_filename = "Unknown"; } PG(last_error_type) = type; - PG(last_error_message) = estrdup(buffer); - PG(last_error_file) = estrdup(error_filename); + PG(last_error_message) = strdup(buffer); + PG(last_error_file) = strdup(error_filename); PG(last_error_lineno) = error_lineno; } @@ -1399,11 +1399,11 @@ static zval *php_get_configuration_directive_for_zend(zend_string *name) static void php_free_request_globals(void) { if (PG(last_error_message)) { - efree(PG(last_error_message)); + free(PG(last_error_message)); PG(last_error_message) = NULL; } if (PG(last_error_file)) { - efree(PG(last_error_file)); + free(PG(last_error_file)); PG(last_error_file) = NULL; } if (PG(php_sys_temp_dir)) { |