summaryrefslogtreecommitdiff
path: root/ext/standard/string.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/string.c')
-rw-r--r--ext/standard/string.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 8d95290ca2..bc024a13cd 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1735,7 +1735,7 @@ PHP_FUNCTION(pathinfo)
}
if (opt == PHP_PATHINFO_ALL) {
- RETURN_ZVAL(&tmp, 0, 1);
+ ZVAL_COPY_VALUE(return_value, &tmp);
} else {
zval *element;
if ((element = zend_hash_get_current_data(Z_ARRVAL(tmp))) != NULL) {
@@ -1743,9 +1743,8 @@ PHP_FUNCTION(pathinfo)
} else {
ZVAL_EMPTY_STRING(return_value);
}
+ zval_ptr_dtor(&tmp);
}
-
- zval_ptr_dtor(&tmp);
}
/* }}} */