[PHP-CVS] cvs: php4 /ext/standard string.c

[Sander Roobol]

sander          Sun Oct  6 14:39:03 2002 EDT

  Modified files:              
    /php4/ext/standard  string.c 
  Log:
  Fix another leak in implode()
  
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.314 php4/ext/standard/string.c:1.315
--- php4/ext/standard/string.c:1.314    Sun Oct  6 07:28:11 2002
+++ php4/ext/standard/string.c  Sun Oct  6 14:39:03 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.314 2002/10/06 11:28:11 sander Exp $ */
+/* $Id: string.c,v 1.315 2002/10/06 18:39:03 sander Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -860,14 +860,14 @@
        }
 
        if (argc == 1) {
-               MAKE_STD_ZVAL(delim);
-#define _IMPL_EMPTY ""
-               ZVAL_STRINGL(delim, _IMPL_EMPTY, sizeof(_IMPL_EMPTY) - 1, 0);
-
                if (Z_TYPE_PP(arg1) != IS_ARRAY) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to 
implode must be an array.");
                        return;
                }
+
+               MAKE_STD_ZVAL(delim);
+#define _IMPL_EMPTY ""
+               ZVAL_STRINGL(delim, _IMPL_EMPTY, sizeof(_IMPL_EMPTY) - 1, 0);
 
                SEPARATE_ZVAL(arg1);
                arr = *arg1;



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