diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-03-29 15:36:53 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-03-29 15:36:53 -0700 |
| commit | 949ea036642e4640cf09aed1b2e70ca739579504 (patch) | |
| tree | fe646f06609f8496c132c9cad7e9cc4153d940c3 /php/src/php7/Properties.cpp | |
| parent | Override java.lang.AutoCloseable.close in Ice.Communicator to not throw any e... (diff) | |
| download | ice-949ea036642e4640cf09aed1b2e70ca739579504.tar.bz2 ice-949ea036642e4640cf09aed1b2e70ca739579504.tar.xz ice-949ea036642e4640cf09aed1b2e70ca739579504.zip | |
ICE-7716 - more scripting language fixes
Diffstat (limited to 'php/src/php7/Properties.cpp')
| -rw-r--r-- | php/src/php7/Properties.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/php/src/php7/Properties.cpp b/php/src/php7/Properties.cpp index e394d62c00c..df4ffb4848b 100644 --- a/php/src/php7/Properties.cpp +++ b/php/src/php7/Properties.cpp @@ -524,6 +524,14 @@ ZEND_FUNCTION(Ice_createProperties) RETURN_NULL(); } + if(arglist) + { + while(Z_TYPE_P(arglist) == IS_REFERENCE) + { + arglist = Z_REFVAL_P(arglist); + } + } + Ice::StringSeq seq; if(arglist && !extractStringArray(arglist, seq)) { @@ -553,7 +561,7 @@ ZEND_FUNCTION(Ice_createProperties) RETURN_NULL(); } - if(arglist && Z_ISREF_P(arglist)) + if(arglist) { zval_dtor(arglist); if(!createStringArray(arglist, seq)) |