diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index 192b37a53c8..f34735ab954 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -1627,13 +1627,9 @@ GlobalWindowImpl::Unescape(const nsString& aStr, nsString& aReturn)
 
   // Unescape the string
   char* src = nsUnescape(inBuf);
-//  nsAllocator::Free(inBuf);
-  if (nsnull == src) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
 
   PRInt32 maxLength, srcLen;
-  srcLen = aStr.Length();
+  srcLen = nsCRT::strlen(src);
 
   // Get the expected length of the result string
   result = decoder->GetMaxLength(src, srcLen, &maxLength);