Merge pull request #1262 from athenian200/solaris-work

Support Modern Solaris 

1 files changed, 17 insertions, 2 deletions

diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 65cc81a1a..3fc9200c1 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -205,7 +205,12 @@ size_t
 ExtraMallocSize(JSErrorReport* report)
 {
     if (report->linebuf())
-        return (report->linebufLength() + 1) * sizeof(char16_t);
+	/*
+	 * Mozilla bug 1352449. Count with null
+	 * terminator and alignment. See CopyExtraData for
+	 * the details about alignment.
+	 */    
+        return (report->linebufLength() + 1) * sizeof(char16_t) + 1;
 
     return 0;
 }
@@ -220,10 +225,20 @@ bool
 CopyExtraData(JSContext* cx, uint8_t** cursor, JSErrorReport* copy, JSErrorReport* report)
 {
     if (report->linebuf()) {
+	/*
+	 * Make sure cursor is properly aligned for char16_t for platforms
+	 * which need it and it's at the end of the buffer on exit.
+	 */
+	size_t alignment_backlog = 0;
+        if (size_t(*cursor) % 2)
+	    (*cursor)++;
+        else
+	    alignment_backlog = 1;	
+
         size_t linebufSize = (report->linebufLength() + 1) * sizeof(char16_t);
         const char16_t* linebufCopy = (const char16_t*)(*cursor);
         js_memcpy(*cursor, report->linebuf(), linebufSize);
-        *cursor += linebufSize;
+        *cursor += linebufSize + alignment_backlog;
         copy->initBorrowedLinebuf(linebufCopy, report->linebufLength(), report->tokenOffset());
     }