From 4f0874faa1760095bbbf76862f4dc7d00a92b9c0 Mon Sep 17 00:00:00 2001 From: "jwalden%mit.edu" Date: Sat, 17 Feb 2007 17:57:51 +0000 Subject: [PATCH] Bug 352285 - the previous patch worked; the Tp2 failure was because Tp2 hadn't actually been correctly set up to run on the tinderbox yet. Sigh... git-svn-id: svn://10.0.0.236/trunk@220481 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsopcode.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mozilla/js/src/jsopcode.c b/mozilla/js/src/jsopcode.c index 3efb6ed16f6..41b1eeb3fc5 100644 --- a/mozilla/js/src/jsopcode.c +++ b/mozilla/js/src/jsopcode.c @@ -3440,7 +3440,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb) lval = ""; do_qname: sn = js_GetSrcNote(jp->script, pc); - rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), 0); + rval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), + inXML ? DONT_ESCAPE : 0); if (!rval) return NULL; RETRACT(&ss->sprinter, rval); @@ -3930,6 +3931,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb) break; BEGIN_LITOPX_CASE(JSOP_QNAMEPART, 0) + inXML = JS_TRUE; if (pc[JSOP_QNAMEPART_LENGTH] == JSOP_TOATTRNAME) { saveop = JSOP_TOATTRNAME; len += JSOP_TOATTRNAME_LENGTH; @@ -4041,14 +4043,16 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb) BEGIN_LITOPX_CASE(JSOP_XMLCDATA, 0) todo = SprintPut(&ss->sprinter, "sprinter, ATOM_TO_STRING(atom), 0)) + if (!QuoteString(&ss->sprinter, ATOM_TO_STRING(atom), + DONT_ESCAPE)) return NULL; SprintPut(&ss->sprinter, "]]>", 3); END_LITOPX_CASE BEGIN_LITOPX_CASE(JSOP_XMLCOMMENT, 0) todo = SprintPut(&ss->sprinter, "", 3); END_LITOPX_CASE