Gabriel Ivăncescu : vbscript: Reference count the vbscode_t.
Alexandre Julliard
julliard at winehq.org
Fri Dec 6 16:06:39 CST 2019
Module: wine
Branch: master
Commit: 6c2f99c84e9921f03b46c09e01f17d8c01d32681
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2f99c84e9921f03b46c09e01f17d8c01d32681
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Fri Dec 6 13:45:28 2019 +0100
vbscript: Reference count the vbscode_t.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/vbscript/compile.c | 4 +++-
dlls/vbscript/vbscript.c | 11 +++++++++--
dlls/vbscript/vbscript.h | 1 +
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c
index 9ddfacfb41..d8ae0fc313 100644
--- a/dlls/vbscript/compile.c
+++ b/dlls/vbscript/compile.c
@@ -1832,7 +1832,8 @@ void release_vbscode(vbscode_t *code)
{
unsigned i;
- list_remove(&code->entry);
+ if(--code->ref)
+ return;
for(i=0; i < code->bstr_cnt; i++)
SysFreeString(code->bstr_pool[i]);
@@ -1875,6 +1876,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source)
ret->main_code.type = FUNC_GLOBAL;
ret->main_code.code_ctx = ret;
+ ret->ref = 1;
list_init(&ret->entry);
return ret;
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index f7890362c6..94daace4fe 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -223,7 +223,10 @@ static void release_script(script_ctx_t *ctx)
if(code->last_class) code->last_class->next = NULL;
}
else
+ {
+ list_remove(&code->entry);
release_vbscode(code);
+ }
}
while(!list_empty(&ctx->named_items)) {
@@ -262,8 +265,12 @@ static void release_script(script_ctx_t *ctx)
static void release_code_list(script_ctx_t *ctx)
{
- while(!list_empty(&ctx->code_list))
- release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry));
+ while(!list_empty(&ctx->code_list)) {
+ vbscode_t *iter = LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry);
+
+ list_remove(&iter->entry);
+ release_vbscode(iter);
+ }
}
static void decrease_state(VBScript *This, SCRIPTSTATE state)
diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index f4e7bc7b2d..2f1b61b1ab 100644
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -336,6 +336,7 @@ struct _function_t {
struct _vbscode_t {
instr_t *instrs;
WCHAR *source;
+ unsigned ref;
BOOL option_explicit;
More information about the wine-cvs
mailing list