Module: wine Branch: master Commit: 895d059ebe8f58a1ce2b2526a63cb6b29d9d1606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=895d059ebe8f58a1ce2b2526a6... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:50:18 2013 +0100 jscript: Use jsstr_flush in String_concat. --- dlls/jscript/string.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 70be13a..1d4a188 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -331,8 +331,8 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + unsigned len = 0, i, str_cnt; jsstr_t **strs, *ret = NULL; - DWORD len = 0, i, l, str_cnt; WCHAR *ptr; HRESULT hres; @@ -364,11 +364,8 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns ret = jsstr_alloc_buf(len); if(ret) { ptr = ret->str; - for(i=0; i < str_cnt; i++) { - l = jsstr_length(strs[i]); - memcpy(ptr, strs[i]->str, l*sizeof(WCHAR)); - ptr += l; - } + for(i=0; i < str_cnt; i++) + ptr += jsstr_flush(strs[i], ptr); }else { hres = E_OUTOFMEMORY; }