From 783190088274822a9a63b78edef97e6d20a7eb72 Mon Sep 17 00:00:00 2001 From: Rob Richards Date: Tue, 7 Feb 2006 11:50:54 +0000 Subject: [PATCH] fix mem leak with iterators fix object casting for edge case --- ext/com_dotnet/com_handlers.c | 2 +- ext/com_dotnet/com_iterator.c | 53 ++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 04c771c9d6..052d9919ea 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -503,7 +503,7 @@ static int com_object_cast(zval *readobj, zval *writeobj, int type, int should_f 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); } diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index 454d5a2f55..66dbfb4267 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -38,6 +38,7 @@ struct php_com_iterator { 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 @@ static void com_iter_dtor(zend_object_iterator *iter TSRMLS_DC) } VariantClear(&I->v); VariantClear(&I->safe_array); + if (I->zdata) { + zval_ptr_dtor((zval**)&I->zdata); + } efree(I); } @@ -56,32 +60,18 @@ static int com_iter_valid(zend_object_iterator *iter TSRMLS_DC) { 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 @@ static int com_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC) { 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 @@ static int com_iter_move_forwards(zend_object_iterator *iter TSRMLS_DC) 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 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object TSRMLS DISPPARAMS dp; VARIANT v; unsigned long n_fetched; + zval *ptr; obj = CDNO_FETCH(object); @@ -163,6 +163,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object TSRMLS 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 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object TSRMLS /* 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 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object TSRMLS 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; -- 2.40.0