From f8b20563aa5c8419e82020698295d27e6aab5688 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 8 Mar 2012 14:28:02 +0100 Subject: [PATCH] jscript: Properly handle NULL strings in add_eval. --- dlls/jscript/engine.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 11b434fe9fb..0ae142a99e5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1509,8 +1509,11 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocStringLen(NULL, len1+len2); - memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); - memcpy(V_BSTR(retv)+len1, rstr, (len2+1)*sizeof(WCHAR)); + if(len1) + memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); + if(len2) + memcpy(V_BSTR(retv)+len1, rstr, len2*sizeof(WCHAR)); + V_BSTR(retv)[len1+len2] = 0; } if(V_VT(&l) != VT_BSTR) -- 2.11.4.GIT