ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Reimplemented do_attribute_tag_format without direct access to object's string buffer.

Browse Source
This commit is contained in:
Jacek Caban 2013-03-06 12:39:38 +01:00 committed by Alexandre Julliard
parent 25dbf32b5d
commit 6eaef96dad
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/jscript/string.c
View File

@ -186,14 +186,11 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, j
} }
static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r, static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsigned argc, jsval_t *argv, jsval_t *r,
const WCHAR *tagname, const WCHAR *attr) const WCHAR *tagname, const WCHAR *attrname)
{ {
static const WCHAR tagfmtW[]
= {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0};
static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0};
jsstr_t *str, *attr_value = NULL; jsstr_t *str, *attr_value = NULL;
const WCHAR *attr_str;
unsigned attr_len; unsigned attr_len;
HRESULT hres; HRESULT hres;
@ -207,19 +204,45 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig
jsstr_release(str); jsstr_release(str);
return hres; return hres;
} }
attr_str = attr_value->str;
attr_len = jsstr_length(attr_value); attr_len = jsstr_length(attr_value);
}else { }else {
attr_str = undefinedW;
attr_len = sizeof(undefinedW)/sizeof(WCHAR)-1; attr_len = sizeof(undefinedW)/sizeof(WCHAR)-1;
} }
if(r) { if(r) {
unsigned attrname_len = strlenW(attrname);
unsigned tagname_len = strlenW(tagname);
jsstr_t *ret; jsstr_t *ret;
ret = jsstr_alloc_buf(2*strlenW(tagname) + strlenW(attr) + attr_len + jsstr_length(str) + 9); ret = jsstr_alloc_buf(2*tagname_len + attrname_len + attr_len + jsstr_length(str) + 9);
if(ret) { if(ret) {
sprintfW(ret->str, tagfmtW, tagname, attr, attr_str, str->str, tagname); WCHAR *ptr = ret->str;
*ptr++ = '<';
memcpy(ptr, tagname, tagname_len*sizeof(WCHAR));
ptr += tagname_len;
*ptr++ = ' ';
memcpy(ptr, attrname, attrname_len*sizeof(WCHAR));
ptr += attrname_len;
*ptr++ = '=';
*ptr++ = '"';
if(attr_value)
jsstr_flush(attr_value, ptr);
else
memcpy(ptr, undefinedW, attr_len*sizeof(WCHAR));
ptr += attr_len;
*ptr++ = '"';
*ptr++ = '>';
ptr += jsstr_flush(str, ptr);
*ptr++ = '<';
*ptr++ = '/';
memcpy(ptr, tagname, tagname_len*sizeof(WCHAR));
ptr += tagname_len;
*ptr = '>';
*r = jsval_string(ret); *r = jsval_string(ret);
}else { }else {
hres = E_OUTOFMEMORY; hres = E_OUTOFMEMORY;