marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Don't assume that ret value is cleared when it's not set explicitly. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Jacek Caban 2016-03-28 17:48:57 +02:00 committed by Alexandre Julliard
parent f198b5a45a
commit d08036120a
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/jscript/compile.c
View File

@ -1479,7 +1479,7 @@ static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statemen
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
return push_instr(ctx, OP_ret) ? S_OK : E_OUTOFMEMORY; return push_instr_uint(ctx, OP_ret, !stat->expr);
} }
/* ECMA-262 3rd Edition 12.10 */ /* ECMA-262 3rd Edition 12.10 */
@ -1857,8 +1857,9 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source,
resolve_labels(ctx, off); resolve_labels(ctx, off);
if(!push_instr(ctx, OP_ret)) hres = push_instr_uint(ctx, OP_ret, !from_eval);
return E_OUTOFMEMORY; if(FAILED(hres))
return hres;
if(TRACE_ON(jscript_disas)) if(TRACE_ON(jscript_disas))
dump_code(ctx, off); dump_code(ctx, off);

19
dlls/jscript/engine.c
View File

@ -194,6 +194,13 @@ static inline IDispatch *stack_topn_objid(script_ctx_t *ctx, unsigned n, DISPID
return get_object(stack_topn(ctx, n+1)); return get_object(stack_topn(ctx, n+1));
} }
static inline jsval_t steal_ret(call_frame_t *frame)
{
jsval_t r = frame->ret;
frame->ret = jsval_undefined();
return r;
}
static void exprval_release(exprval_t *val) static void exprval_release(exprval_t *val)
{ {
switch(val->type) { switch(val->type) {
@ -2323,8 +2330,14 @@ static HRESULT interp_pop(script_ctx_t *ctx)
static HRESULT interp_ret(script_ctx_t *ctx) static HRESULT interp_ret(script_ctx_t *ctx)
{ {
const unsigned clear_ret = get_op_uint(ctx, 0);
call_frame_t *frame = ctx->call_ctx;
TRACE("\n"); TRACE("\n");
if(clear_ret)
jsval_release(steal_ret(frame));
jmp_abs(ctx, -1); jmp_abs(ctx, -1);
return S_OK; return S_OK;
} }
@ -2457,10 +2470,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t
assert(frame->scope == frame->base_scope); assert(frame->scope == frame->base_scope);
ctx->call_ctx = frame->prev_frame; ctx->call_ctx = frame->prev_frame;
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres))
*ret = frame->ret; *ret = steal_ret(frame);
frame->ret = jsval_undefined();
}
release_call_frame(frame); release_call_frame(frame);
return hres; return hres;