From e147d2735e7d10b2793e8a8b4d4e80e8201bb577 Mon Sep 17 00:00:00 2001
From: "mccabe%netscape.com"
 <mccabe%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Aug 2000 23:02:39 +0000
Subject: [PATCH] Fix to 46566.

Always copy the current line string out of the token buffer when generating an error report, rather than just passing the token buffer itself.  The token buffer wasn't necessarily a well-terminated string, so displaying the contents of the string in the error report produced unexpected results.

The unicode string in the error report is owned by a JSString; this string is rooted for the (stack-based) lifetime of the error report.

Fix courtesy jband.

r=mccabe
a=beard


git-svn-id: svn://10.0.0.236/trunk@76035 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/jsscan.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/mozilla/js/src/jsscan.c b/mozilla/js/src/jsscan.c
index 940dba116b6..1a3276d833c 100644
--- a/mozilla/js/src/jsscan.c
+++ b/mozilla/js/src/jsscan.c
@@ -494,7 +494,7 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, uintN flags,
     JSErrorReporter onError;
     JSErrorReport report;
     jschar *tokenptr;
-    JSString *linestr;
+    JSString *linestr = NULL;
     char *message;
     JSBool warning;
 
@@ -512,6 +512,8 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, uintN flags,
     }
     va_end(ap);
 
+    js_AddRoot(cx, &linestr, "error line buffer");
+
     JS_ASSERT(ts->linebuf.limit < ts->linebuf.base + JS_LINE_LIMIT);
     limit = ts->linebuf.limit;
     onError = cx->errorReporter;
@@ -527,8 +529,12 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, uintN flags,
 	report.tokenptr = linestr
 			  ? report.linebuf + (tokenptr - ts->linebuf.base)
 			  : NULL;
-	report.uclinebuf = ts->linebuf.base;
-	report.uctokenptr = tokenptr;
+	report.uclinebuf = linestr
+			  ? JS_GetStringChars(linestr)
+			  : NULL;
+	report.uctokenptr = linestr
+			  ? report.uclinebuf + (tokenptr - ts->linebuf.base)
+			  : NULL;
 
 #if JS_HAS_ERROR_EXCEPTIONS
 	/*
@@ -570,18 +576,6 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, uintN flags,
         }
         if (onError)
             (*onError)(cx, message, &report);
-#if 0
-#if !defined XP_PC || !defined _MSC_VER || _MSC_VER > 800
-    } else {
-	if (ts->filename)
-	    fprintf(stderr, "%s, ", ts->filename);
-	if (ts->lineno)
-	    fprintf(stderr, "line %u: ", ts->lineno);
-	fprintf(stderr, "%s:\n%s\n",message,
-		js_DeflateString(cx, ts->linebuf.base,
-				 ts->linebuf.limit - ts->linebuf.base));
-#endif
-#endif
     }
     if (message)
         JS_free(cx, message);
@@ -594,6 +588,8 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, uintN flags,
     if (report.ucmessage)
         JS_free(cx, (void *)report.ucmessage);
 
+    js_RemoveRoot(cx->runtime, &linestr);
+
     if (!JSREPORT_IS_WARNING(flags)) {
         /* Set the error flag to suppress spurious reports. */
         ts->flags |= TSF_ERROR;