diff --git a/mozilla/base/src/unix/nsFileSpecUnix.cpp b/mozilla/base/src/unix/nsFileSpecUnix.cpp
index dab41c97758..3d14e58b140 100644
--- a/mozilla/base/src/unix/nsFileSpecUnix.cpp
+++ b/mozilla/base/src/unix/nsFileSpecUnix.cpp
@@ -55,7 +55,7 @@
 extern "C" int statvfs(const char *, struct statvfs *);
 #endif
  
- //----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 void nsFileSpecHelpers::Canonify(nsSimpleCharString& ioPath, PRBool inMakeDirs)
 // Canonify, make absolute, and check whether directories exist
 //----------------------------------------------------------------------------------------
@@ -69,7 +69,11 @@ void nsFileSpecHelpers::Canonify(nsSimpleCharString& ioPath, PRBool inMakeDirs)
     }
     char buffer[MAXPATHLEN];
     errno = 0;
+#if defined(SOLARIS)
+    memset(buffer, '\0', sizeof(buffer)); // realpath reads it all, initialized or not.
+#else
     *buffer = '\0';
+#endif
     char* canonicalPath = realpath((const char*)ioPath, buffer);
     if (!canonicalPath)
     {
diff --git a/mozilla/xpcom/io/nsFileSpecUnix.cpp b/mozilla/xpcom/io/nsFileSpecUnix.cpp
index dab41c97758..3d14e58b140 100644
--- a/mozilla/xpcom/io/nsFileSpecUnix.cpp
+++ b/mozilla/xpcom/io/nsFileSpecUnix.cpp
@@ -55,7 +55,7 @@
 extern "C" int statvfs(const char *, struct statvfs *);
 #endif
  
- //----------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 void nsFileSpecHelpers::Canonify(nsSimpleCharString& ioPath, PRBool inMakeDirs)
 // Canonify, make absolute, and check whether directories exist
 //----------------------------------------------------------------------------------------
@@ -69,7 +69,11 @@ void nsFileSpecHelpers::Canonify(nsSimpleCharString& ioPath, PRBool inMakeDirs)
     }
     char buffer[MAXPATHLEN];
     errno = 0;
+#if defined(SOLARIS)
+    memset(buffer, '\0', sizeof(buffer)); // realpath reads it all, initialized or not.
+#else
     *buffer = '\0';
+#endif
     char* canonicalPath = realpath((const char*)ioPath, buffer);
     if (!canonicalPath)
     {