system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 21:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbscript: Change release_dynamic_vars to release a single variable.

Browse source 
We need to free them while iterating an array as well as a linked list.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2019-11-11 14:34:25 +02:00 committed by Alexandre Julliard
parent b7eb693e7f
commit f9613711aa
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/vbscript/interp.c
View file

@ -2243,22 +2243,22 @@ OP_LIST
#undef X
};
void release_dynamic_vars(dynamic_var_t *var)
void release_dynamic_var(dynamic_var_t *var)
{
while(var) {
VariantClear(&var->v);
if(var->array)
SafeArrayDestroy(var->array);
var = var->next;
}
VariantClear(&var->v);
if(var->array)
SafeArrayDestroy(var->array);
}
static void release_exec(exec_ctx_t *ctx)
{
dynamic_var_t *var;
unsigned i;
VariantClear(&ctx->ret_val);
release_dynamic_vars(ctx->dynamic_vars);
for(var = ctx->dynamic_vars; var; var = var->next)
release_dynamic_var(var);
if(ctx->vbthis)
IDispatchEx_Release(&ctx->vbthis->IDispatchEx_iface);

2
dlls/vbscript/vbscript.c
View file

@ -217,7 +217,7 @@ static void release_script(script_ctx_t *ctx)
clear_ei(&ctx->ei);
for(i = 0; i < ctx->global_vars_cnt; i++)
VariantClear(&ctx->global_vars[i]->v);
release_dynamic_var(ctx->global_vars[i]);
heap_free(ctx->global_vars);
heap_free(ctx->global_funcs);

2
dlls/vbscript/vbscript.h
View file

@ -361,7 +361,7 @@ void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN;
HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN;
HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN;
HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN;
void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN;
void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN;
IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;
void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN;
HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN;