[PHP-CVS] cvs: php-src /ext/standard exec.c

[Ilia Alshanetsky]

iliaa           Mon Jul 12 14:49:47 2004 EDT

  Modified files:              
    /php-src/ext/standard       exec.c 
  Log:
  Missing patch.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.110&r2=1.111&ty=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.110 php-src/ext/standard/exec.c:1.111
--- php-src/ext/standard/exec.c:1.110   Tue May 18 09:43:24 2004
+++ php-src/ext/standard/exec.c Mon Jul 12 14:49:47 2004
@@ -16,7 +16,7 @@
    |         Ilia Alshanetsky <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: exec.c,v 1.110 2004/05/18 13:43:24 iliaa Exp $ */
+/* $Id: exec.c,v 1.111 2004/07/12 18:49:47 iliaa Exp $ */
 
 #include <stdio.h>
 #include "php.h"
@@ -197,11 +197,11 @@
        int ret;
 
        if (mode) {
-               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &cmd, 
&cmd_len, &ret_code) == FAILURE) {
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/", &cmd, 
&cmd_len, &ret_code) == FAILURE) {
                        RETURN_FALSE;
                }
        } else {
-               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zz", &cmd, 
&cmd_len, &ret_array, &ret_code) == FAILURE) {
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/z/", &cmd, 
&cmd_len, &ret_array, &ret_code) == FAILURE) {
                        RETURN_FALSE;
                }
        }
@@ -213,8 +213,10 @@
        if (!ret_array) {
                ret = php_exec(mode, cmd, NULL, return_value TSRMLS_CC);
        } else {
-               zval_dtor(ret_array);
-               array_init(ret_array);
+               if (Z_TYPE_P(ret_array) != IS_ARRAY) {
+                       zval_dtor(ret_array);
+                       array_init(ret_array);
+               }
                ret = php_exec(2, cmd, ret_array, return_value TSRMLS_CC);
        }
        if (ret_code) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php