Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 453915 -- Make namespace handling in E4X more robust, r=mrbkap, a=dveditz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@254688 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
crowder%fiverocks.com 2008-10-20 21:32:52 +00:00
parent 9a1a7d4835
commit c8c7be4cab
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/js/src/jsxml.c
View File

@ -1975,6 +1975,7 @@ ParseXMLSource(JSContext *cx, JSString *src)
{
jsval nsval;
JSXMLNamespace *ns;
JSString *uri;
size_t urilen, srclen, length, offset, dstlen;
jschar *chars;
const jschar *srcp, *endp;
@ -1988,8 +1989,8 @@ ParseXMLSource(JSContext *cx, JSString *src)
JSXMLArray nsarray;
uintN flags;
static const char prefix[] = "<parent xmlns='";
static const char middle[] = "'>";
static const char prefix[] = "<parent xmlns=\"";
static const char middle[] = "\">";
static const char suffix[] = "</parent>";
#define constrlen(constr) (sizeof(constr) - 1)
@ -1997,8 +1998,9 @@ ParseXMLSource(JSContext *cx, JSString *src)
if (!js_GetDefaultXMLNamespace(cx, &nsval))
return NULL;
ns = (JSXMLNamespace *) JS_GetPrivate(cx, JSVAL_TO_OBJECT(nsval));
uri = js_EscapeAttributeValue(cx, ns->uri, JS_FALSE);
urilen = JSSTRING_LENGTH(ns->uri);
urilen = JSSTRING_LENGTH(uri);
srclen = JSSTRING_LENGTH(src);
length = constrlen(prefix) + urilen + constrlen(middle) + srclen +
constrlen(suffix);
@ -2010,7 +2012,7 @@ ParseXMLSource(JSContext *cx, JSString *src)
dstlen = length;
js_InflateStringToBuffer(cx, prefix, constrlen(prefix), chars, &dstlen);
offset = dstlen;
js_strncpy(chars + offset, JSSTRING_CHARS(ns->uri), urilen);
js_strncpy(chars + offset, JSSTRING_CHARS(uri), urilen);
offset += urilen;
dstlen = length - offset + 1;
js_InflateStringToBuffer(cx, middle, constrlen(middle), chars + offset,