1 files changed, 11 insertions, 0 deletions
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index 569da5d56f..6888dee376 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -127,6 +127,17 @@ SandboxDump(JSContext* cx, unsigned argc, Value* vp)
     if (!cstr)
         return false;
 
+#if defined(XP_MACOSX)
+    // Be nice and convert all \r to \n.
+    char* c = cstr;
+    char* cEnd = cstr + strlen(cstr);
+    while (c < cEnd) {
+        if (*c == '\r')
+            *c = '\n';
+        c++;
+    }
+#endif
+
     fputs(cstr, stdout);
     fflush(stdout);
     args.rval().setBoolean(true);