diff --git a/mozilla/layout/base/nsPresState.cpp b/mozilla/layout/base/nsPresState.cpp
index f4b096be092..d49635643af 100644
--- a/mozilla/layout/base/nsPresState.cpp
+++ b/mozilla/layout/base/nsPresState.cpp
@@ -68,13 +68,12 @@ nsPresState::GetStateProperty(const nsAReadableString& aName,
   if (mPropertyTable)
     str = dont_AddRef(NS_STATIC_CAST(nsISupportsWString*, mPropertyTable->Get(&key)));
    
+  aResult.SetLength(0);
   if (str) {
-    PRUnichar* data;
+    PRUnichar* data = nsnull;
     str->GetData(&data);
     aResult.Append(data);
     nsMemory::Free(data);
-  } else {
-    aResult.SetLength(0);
   }
   return NS_OK;
 }
diff --git a/mozilla/layout/base/src/nsPresState.cpp b/mozilla/layout/base/src/nsPresState.cpp
index f4b096be092..d49635643af 100644
--- a/mozilla/layout/base/src/nsPresState.cpp
+++ b/mozilla/layout/base/src/nsPresState.cpp
@@ -68,13 +68,12 @@ nsPresState::GetStateProperty(const nsAReadableString& aName,
   if (mPropertyTable)
     str = dont_AddRef(NS_STATIC_CAST(nsISupportsWString*, mPropertyTable->Get(&key)));
    
+  aResult.SetLength(0);
   if (str) {
-    PRUnichar* data;
+    PRUnichar* data = nsnull;
     str->GetData(&data);
     aResult.Append(data);
     nsMemory::Free(data);
-  } else {
-    aResult.SetLength(0);
   }
   return NS_OK;
 }