From 57aa75f78f521777a56718ed3383518e6fa8151c Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 16 Oct 2008 13:55:47 -0500 Subject: [PATCH] msxml3: Fixed dynamic properties allocation. --- dlls/msxml3/dispex.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 927206879a2..ab9d909035e 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -436,18 +436,37 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } if(grfdex & fdexNameEnsure) { + dispex_dynamic_data_t *dynamic_data; + TRACE("creating dynamic prop %s\n", debugstr_w(bstrName)); - if(!This->dynamic_data) { - This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); - This->dynamic_data->props = heap_alloc(This->dynamic_data->buf_size = 4); - }else if(This->dynamic_data->buf_size == This->dynamic_data->prop_cnt) { - This->dynamic_data->props = heap_realloc(This->dynamic_data->props, This->dynamic_data->buf_size<<=1); + if(This->dynamic_data) { + dynamic_data = This->dynamic_data; + }else { + dynamic_data = This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); + if(!dynamic_data) + return E_OUTOFMEMORY; } - This->dynamic_data->props[This->dynamic_data->prop_cnt].name = heap_strdupW(bstrName); - VariantInit(&This->dynamic_data->props[This->dynamic_data->prop_cnt].var); - *pid = DISPID_DYNPROP_0 + This->dynamic_data->prop_cnt++; + if(!dynamic_data->buf_size) { + dynamic_data->props = heap_alloc(sizeof(dynamic_prop_t)*4); + if(!dynamic_data->props) + return E_OUTOFMEMORY; + dynamic_data->buf_size = 4; + }else if(dynamic_data->buf_size == dynamic_data->prop_cnt) { + dynamic_prop_t *new_props; + + new_props = heap_realloc(dynamic_data->props, sizeof(dynamic_prop_t)*(dynamic_data->buf_size<<1)); + if(!new_props) + return E_OUTOFMEMORY; + + dynamic_data->props = new_props; + dynamic_data->buf_size <<= 1; + } + + dynamic_data->props[dynamic_data->prop_cnt].name = heap_strdupW(bstrName); + VariantInit(&dynamic_data->props[dynamic_data->prop_cnt].var); + *pid = DISPID_DYNPROP_0 + dynamic_data->prop_cnt++; return S_OK; }