rrichards Tue Feb 7 11:50:54 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/com_dotnet com_handlers.c com_iterator.c
Log:
fix mem leak with iterators
fix object casting for edge case
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.30.2.4&r2=1.30.2.5&diff_format=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.30.2.4
php-src/ext/com_dotnet/com_handlers.c:1.30.2.5
--- php-src/ext/com_dotnet/com_handlers.c:1.30.2.4 Sat Feb 4 10:57:27 2006
+++ php-src/ext/com_dotnet/com_handlers.c Tue Feb 7 11:50:54 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.30.2.4 2006/02/04 10:57:27 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.30.2.5 2006/02/07 11:50:54 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -503,7 +503,7 @@
VariantInit(&v);
if (V_VT(&obj->v) == VT_DISPATCH) {
- if (FAILURE == php_com_do_invoke_by_id(obj, DISPID_VALUE,
+ if (SUCCESS != php_com_do_invoke_by_id(obj, DISPID_VALUE,
DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v, 0,
NULL, 1 TSRMLS_CC)) {
VariantCopy(&v, &obj->v);
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_iterator.c?r1=1.9.2.1&r2=1.9.2.2&diff_format=u
Index: php-src/ext/com_dotnet/com_iterator.c
diff -u php-src/ext/com_dotnet/com_iterator.c:1.9.2.1
php-src/ext/com_dotnet/com_iterator.c:1.9.2.2
--- php-src/ext/com_dotnet/com_iterator.c:1.9.2.1 Sun Jan 1 12:50:00 2006
+++ php-src/ext/com_dotnet/com_iterator.c Tue Feb 7 11:50:54 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_iterator.c,v 1.9.2.1 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: com_iterator.c,v 1.9.2.2 2006/02/07 11:50:54 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -38,6 +38,7 @@
VARIANT safe_array;
VARTYPE sa_type;
LONG sa_max;
+ zval *zdata;
};
static void com_iter_dtor(zend_object_iterator *iter TSRMLS_DC)
@@ -49,6 +50,9 @@
}
VariantClear(&I->v);
VariantClear(&I->safe_array);
+ if (I->zdata) {
+ zval_ptr_dtor((zval**)&I->zdata);
+ }
efree(I);
}
@@ -56,32 +60,18 @@
{
struct php_com_iterator *I = (struct php_com_iterator*)iter->data;
- if (I->key == (ulong)-1) {
- return FAILURE;
+ if (I->zdata) {
+ return SUCCESS;
}
- return SUCCESS;
+
+ return FAILURE;
}
static void com_iter_get_data(zend_object_iterator *iter, zval ***data
TSRMLS_DC)
{
struct php_com_iterator *I = (struct php_com_iterator*)iter->data;
- zval **ptr_ptr;
- zval *ptr;
-
- /* sanity */
- if (I->key == (ulong)-1) {
- *data = NULL;
- return;
- }
-
- MAKE_STD_ZVAL(ptr);
- php_com_zval_from_variant(ptr, &I->v, I->code_page TSRMLS_CC);
- /* php_com_wrap_variant(ptr, &I->v, I->code_page TSRMLS_CC); */
- ptr_ptr = emalloc(sizeof(*ptr_ptr));
- *ptr_ptr = ptr;
- *data = ptr_ptr;
- return;
+ *data = &I->zdata;
}
static int com_iter_get_key(zend_object_iterator *iter, char **str_key, uint
*str_key_len,
@@ -100,15 +90,20 @@
{
struct php_com_iterator *I = (struct php_com_iterator*)iter->data;
unsigned long n_fetched;
+ zval *ptr;
/* release current cached element */
VariantClear(&I->v);
+ if (I->zdata) {
+ zval_ptr_dtor((zval**)&I->zdata);
+ I->zdata = NULL;
+ }
+
if (I->ev) {
/* Get the next element */
if (SUCCEEDED(IEnumVARIANT_Next(I->ev, 1, &I->v, &n_fetched))
&& n_fetched > 0) {
I->key++;
- return SUCCESS;
} else {
/* indicate that there are no more items */
I->key = (ulong)-1;
@@ -121,13 +116,17 @@
return FAILURE;
}
I->key++;
- if (php_com_safearray_get_elem(&I->safe_array, &I->v,
(LONG)I->key TSRMLS_CC)) {
- return SUCCESS;
- } else {
+ if (php_com_safearray_get_elem(&I->safe_array, &I->v,
(LONG)I->key TSRMLS_CC) == 0) {
I->key = (ulong)-1;
return FAILURE;
}
}
+
+ MAKE_STD_ZVAL(ptr);
+ php_com_zval_from_variant(ptr, &I->v, I->code_page TSRMLS_CC);
+ /* php_com_wrap_variant(ptr, &I->v, I->code_page TSRMLS_CC); */
+ I->zdata = ptr;
+ return SUCCESS;
}
@@ -148,6 +147,7 @@
DISPPARAMS dp;
VARIANT v;
unsigned long n_fetched;
+ zval *ptr;
obj = CDNO_FETCH(object);
@@ -163,6 +163,7 @@
I->iter.funcs = &com_iter_funcs;
I->iter.data = I;
I->code_page = obj->code_page;
+ I->zdata = NULL;
VariantInit(&I->safe_array);
VariantInit(&I->v);
@@ -189,6 +190,9 @@
/* pre-fetch the element */
if (php_com_safearray_get_elem(&I->safe_array, &I->v, bound
TSRMLS_CC)) {
I->key = bound;
+ MAKE_STD_ZVAL(ptr);
+ php_com_zval_from_variant(ptr, &I->v, I->code_page
TSRMLS_CC);
+ I->zdata = ptr;
} else {
I->key = (ulong)-1;
}
@@ -220,6 +224,9 @@
if (SUCCEEDED(IEnumVARIANT_Next(I->ev, 1, &I->v, &n_fetched))
&& n_fetched > 0) {
/* indicate that we have element 0 */
I->key = 0;
+ MAKE_STD_ZVAL(ptr);
+ php_com_zval_from_variant(ptr, &I->v, I->code_page
TSRMLS_CC);
+ I->zdata = ptr;
} else {
/* indicate that there are no more items */
I->key = (ulong)-1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
