diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-02 12:12:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-02 12:12:40 +0800 |
| commit | 3fa0cee640bd54a500fcaa8aa8293a255d0d3191 (patch) | |
| tree | 2f3c4fe063b1f204231facf5c4d9cdf21808c0ae /ext | |
| parent | 39845250f242b7739d30b4b8a287b4a6130d8fa1 (diff) | |
| download | php-git-3fa0cee640bd54a500fcaa8aa8293a255d0d3191.tar.gz | |
Revert "Use zend_get_executed_filename_ex"
This reverts commit 2a37625c20032d54af55a88d54d1a3a1ecc068d1.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/assert.c | 6 | ||||
| -rw-r--r-- | ext/standard/mail.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index a03418030d..87462185a8 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -219,9 +219,11 @@ PHP_FUNCTION(assert) zval *args = safe_emalloc(!description ? 3 : 4, sizeof(zval), 0); zval retval; int i; + uint32_t lineno = zend_get_executed_lineno(); + const char *filename = zend_get_executed_filename(); - ZVAL_STR_COPY(&args[0], zend_get_executed_filename_ex()); - ZVAL_LONG (&args[1], zend_get_executed_lineno()); + ZVAL_STRING(&args[0], SAFE_STRING(filename)); + ZVAL_LONG (&args[1], lineno); ZVAL_STRING(&args[2], SAFE_STRING(myeval)); ZVAL_FALSE(&retval); diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 8fe3de6622..3762bb8bda 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -521,10 +521,10 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char } if (PG(mail_x_header)) { - zend_string *tmp = zend_get_executed_filename_ex(); + const char *tmp = zend_get_executed_filename(); zend_string *f; - f = php_basename(ZSTR_VAL(tmp), ZSTR_LEN(tmp), NULL, 0); + f = php_basename(tmp, strlen(tmp), NULL, 0); if (headers != NULL && *headers) { spprintf(&hdr, 0, "X-PHP-Originating-Script: " ZEND_LONG_FMT ":%s\n%s", php_getuid(), ZSTR_VAL(f), headers); |