Re: com php-src: Fixed argument numbering: main/streams/userspace.c

oh, thanks for catching this. Dmitry. On Tue, Aug 5, 2014 at 8:04 PM, Derick Rethans <derick@php.net> wrote: > On Tue, 5 Aug 2014, Dmitry Stogov wrote: > > > Commit: da2097b34976ba4474bd44cf529ed9ccffa33b95 > > Author: Dmitry Stogov <dmitry@zend.com> Tue, 5 Aug 2014 > 18:17:05 +0400 > > Parents: ce1af1e47bebb5ebbc2aa8f7a0b4dfb91ef8d327 > > Branches: phpng > > > > Link: > > http://git.php.net/?p=php-src.git;a=commitdiff;h=da2097b34976ba4474bd44cf529ed9ccffa33b95 > > > > Log: > > Fixed argument numbering > > > > Changed paths: > > M main/streams/userspace.c > > > > > > Diff: > > diff --git a/main/streams/userspace.c b/main/streams/userspace.c > > index 1283927..2bbb1ec 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]))); > > } > > Are you sure this is right? You change 4, 4 and 4 to 2, 3 and 3. > > cheers, > Derick >