diff --git a/mozilla/xpcom/io/nsIFile.idl b/mozilla/xpcom/io/nsIFile.idl
index 548fe462101..51f5356e541 100644
--- a/mozilla/xpcom/io/nsIFile.idl
+++ b/mozilla/xpcom/io/nsIFile.idl
@@ -41,7 +41,7 @@ interface nsISimpleEnumerator;
  * be safely passed to javascript via xpconnect.  Therefore, the "native
  * methods" are not scriptable. 
  *
- * @status UNDER_REVIEW
+ * @status FROZEN
  */
 [scriptable, uuid(c8c0a080-0868-11d3-915f-d9d889d48e3c)]
 interface nsIFile : nsISupports
diff --git a/mozilla/xpcom/io/nsILocalFile.idl b/mozilla/xpcom/io/nsILocalFile.idl
index 5155a9b6621..e7c7eb9e8f6 100644
--- a/mozilla/xpcom/io/nsILocalFile.idl
+++ b/mozilla/xpcom/io/nsILocalFile.idl
@@ -42,7 +42,7 @@
  *
  * It follows the same string conventions as nsIFile.
  *
- * @status UNDER_REVIEW
+ * @status FROZEN
  */
 [scriptable, uuid(aa610f20-a889-11d3-8c81-000064657374)]
 interface nsILocalFile : nsIFile
diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp
index 297f3dc8283..bd8d5f0dd5e 100644
--- a/mozilla/xpcom/io/nsLocalFileUnix.cpp
+++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp
@@ -1611,7 +1611,7 @@ convert_native_to_ucs2(const char *input, unsigned inputLen, nsAString &result)
     result.Truncate();
 
     // allocate space for largest possible result
-    result.SetCapacity(inputLen + 1);
+    result.SetLength(inputLen);
 
     nsAString::iterator start;
     result.BeginWriting(start);