cvs: php-src(PHP_4_3) /ext/standard file.c
| From: | Ilia Alshanetsky | Date: | Fri, 28 Nov 2003 18:33:20 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-24701@lists.php.net to get a copy of this message | ||
iliaa Fri Nov 28 13:33:20 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard file.c
Log:
MFH: More memory leak fixes for stream contexts.
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.40 php-src/ext/standard/file.c:1.279.2.41
--- php-src/ext/standard/file.c:1.279.2.40 Sun Nov 23 20:43:59 2003
+++ php-src/ext/standard/file.c Fri Nov 28 13:33:18 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.40 2003/11/24 01:43:59 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.41 2003/11/28 18:33:18 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -614,6 +614,7 @@
MAKE_STD_ZVAL(newval);
*newval = *(stream->wrapperdata);
zval_copy_ctor(newval);
+ INIT_PZVAL(newval);
add_assoc_zval(return_value, "wrapper_data", newval);
}
@@ -994,10 +995,9 @@
context = decode_context_param(zcontext TSRMLS_CC);
ZEND_VERIFY_RESOURCE(context);
- array_init(return_value);
*return_value = *context->options;
zval_copy_ctor(return_value);
-
+ INIT_PZVAL(return_value);
}
/* }}} */