Jacek Caban : vbscript: Don't leak memory in parser.
Alexandre Julliard
julliard at winehq.org
Mon Sep 12 11:42:59 CDT 2011
Module: wine
Branch: master
Commit: bb80eaa492c0eda28d24e039e543c41a1c200a86
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb80eaa492c0eda28d24e039e543c41a1c200a86
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Sep 12 12:29:31 2011 +0200
vbscript: Don't leak memory in parser.
---
dlls/vbscript/parse.h | 3 +++
dlls/vbscript/parser.y | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h
index 56b3e1b..0e69921 100644
--- a/dlls/vbscript/parse.h
+++ b/dlls/vbscript/parse.h
@@ -87,8 +87,11 @@ typedef struct {
statement_t *stats;
statement_t *stats_tail;
+
+ vbsheap_t heap;
} parser_ctx_t;
HRESULT parse_script(parser_ctx_t*,const WCHAR*) DECLSPEC_HIDDEN;
+void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN;
int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN;
void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN;
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index c1c7e61..607fcb6 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -280,8 +280,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size)
{
void *ret;
- /* FIXME: leaks! */
- ret = heap_alloc(size);
+ ret = vbsheap_alloc(&ctx->heap, size);
if(!ret)
ctx->hres = E_OUTOFMEMORY;
return ret;
@@ -292,6 +291,8 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code)
ctx->code = ctx->ptr = code;
ctx->end = ctx->code + strlenW(ctx->code);
+ vbsheap_init(&ctx->heap);
+
ctx->parse_complete = FALSE;
ctx->hres = S_OK;
@@ -311,3 +312,8 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code)
return S_OK;
}
+
+void parser_release(parser_ctx_t *ctx)
+{
+ vbsheap_free(&ctx->heap);
+}
More information about the wine-cvs
mailing list