summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-08-05 18:17:05 +0400
committerDmitry Stogov <dmitry@zend.com>2014-08-05 18:17:05 +0400
commitda2097b34976ba4474bd44cf529ed9ccffa33b95 (patch)
tree41f9686aa11ba74c269f33480700ded9b614fe98 /main
parentce1af1e47bebb5ebbc2aa8f7a0b4dfb91ef8d327 (diff)
downloadphp-git-da2097b34976ba4474bd44cf529ed9ccffa33b95.tar.gz
Fixed argument numbering
Diffstat (limited to 'main')
-rw-r--r--main/streams/userspace.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 12839274c8..2bbb1ec277 100644
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -370,7 +370,6 @@ static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, const char *
ZVAL_STRING(&args[1], mode);
ZVAL_LONG(&args[2], options);
ZVAL_NEW_REF(&args[3], &EG(uninitialized_zval));
- ZVAL_UNDEF(&args[4]);
ZVAL_STRING(&zfuncname, USERSTREAM_OPEN);
@@ -386,8 +385,8 @@ static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, const char *
stream = php_stream_alloc_rel(&php_stream_userspace_ops, us, 0, mode);
/* if the opened path is set, copy it out */
- if (Z_ISREF(args[4]) && Z_TYPE_P(Z_REFVAL(args[4])) == IS_STRING && opened_path) {
- *opened_path = estrndup(Z_STRVAL_P(Z_REFVAL(args[4])), Z_STRLEN_P(Z_REFVAL(args[4])));
+ if (Z_ISREF(args[2]) && Z_TYPE_P(Z_REFVAL(args[3])) == IS_STRING && opened_path) {
+ *opened_path = estrndup(Z_STRVAL_P(Z_REFVAL(args[3])), Z_STRLEN_P(Z_REFVAL(args[3])));
}
/* set wrapper data to be a reference to our object */