diff --git a/mozilla/accessible/src/msaa/CAccessibleAction.cpp b/mozilla/accessible/src/msaa/CAccessibleAction.cpp
index f3bc2da0c28..688413fc42c 100755
--- a/mozilla/accessible/src/msaa/CAccessibleAction.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleAction.cpp
@@ -110,8 +110,10 @@ CAccessibleAction::get_description(long aActionIndex, BSTR *aDescription)
     return E_FAIL;
 
   if (!description.IsVoid()) {
-    return ::SysReAllocStringLen(aDescription, description.get(),
-                                 description.Length());
+    INT result = ::SysReAllocStringLen(aDescription, description.get(),
+                                       description.Length());
+    if (!result)
+      return E_OUTOFMEMORY;
   }
 
   return S_OK;
@@ -152,10 +154,10 @@ CAccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding,
   for (PRUint32 i = 0; i < numBinding; i++) {
     nsAutoString key;
     keys->Item(i, key);
-    HRESULT hr = ::SysReAllocStringLen(aKeyBinding[i], key.get(),
+    INT result = ::SysReAllocStringLen(aKeyBinding[i], key.get(),
                                        key.Length());
-    if (FAILED(hr))
-      return hr;
+    if (!result)
+      return E_OUTOFMEMORY;
   }
 
   return S_OK;
@@ -175,8 +177,11 @@ CAccessibleAction::get_name(long aActionIndex, BSTR *aName)
   if (NS_FAILED(acc->GetActionName(index, name)))
     return E_FAIL;
 
-  if (!name.IsVoid())
-    return ::SysReAllocStringLen(aName, name.get(), name.Length());
+  if (!name.IsVoid()) {
+    INT result = ::SysReAllocStringLen(aName, name.get(), name.Length());
+    if (!result)
+      return E_OUTOFMEMORY;
+  }
 
   return S_OK;
 }
diff --git a/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp b/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp
index 1cda3df1d81..4d47eaadda0 100755
--- a/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp
@@ -135,8 +135,9 @@ CAccessibleHyperlink::get_anchorTarget(long aIndex, VARIANT *aAnchorTarget)
   AppendUTF8toUTF16(path, stringURI);
 
   aAnchorTarget->vt = VT_BSTR;
-  return ::SysReAllocStringLen(&aAnchorTarget->bstrVal, stringURI.get(),
-                               stringURI.Length());
+  INT result = ::SysReAllocStringLen(&aAnchorTarget->bstrVal, stringURI.get(),
+                                     stringURI.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
diff --git a/mozilla/accessible/src/msaa/CAccessibleImage.cpp b/mozilla/accessible/src/msaa/CAccessibleImage.cpp
index 70e241fc50d..b89dac1d91e 100755
--- a/mozilla/accessible/src/msaa/CAccessibleImage.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleImage.cpp
@@ -82,8 +82,9 @@ CAccessibleImage::get_description(BSTR *aDescription)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  return ::SysReAllocStringLen(aDescription, description.get(),
-                               description.Length());
+  INT result = ::SysReAllocStringLen(aDescription, description.get(),
+                                     description.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
diff --git a/mozilla/accessible/src/msaa/CAccessibleTable.cpp b/mozilla/accessible/src/msaa/CAccessibleTable.cpp
index 2d30a4bdea8..c8297514e71 100755
--- a/mozilla/accessible/src/msaa/CAccessibleTable.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleTable.cpp
@@ -159,7 +159,8 @@ CAccessibleTable::get_columnDescription(long aColumn, BSTR *aDescription)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  return ::SysReAllocStringLen(aDescription, descr.get(), descr.Length());
+  INT result = ::SysReAllocStringLen(aDescription, descr.get(), descr.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -329,7 +330,8 @@ CAccessibleTable::get_rowDescription(long aRow, BSTR *aDescription)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  return ::SysReAllocStringLen(aDescription, descr.get(), descr.Length());
+  INT result = ::SysReAllocStringLen(aDescription, descr.get(), descr.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
diff --git a/mozilla/accessible/src/msaa/CAccessibleText.cpp b/mozilla/accessible/src/msaa/CAccessibleText.cpp
index 007231ff130..82ba452a7f4 100755
--- a/mozilla/accessible/src/msaa/CAccessibleText.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleText.cpp
@@ -211,7 +211,8 @@ CAccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR *aText)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  return ::SysReAllocStringLen(aText, text.get(), text.Length());
+  INT result = ::SysReAllocStringLen(aText, text.get(), text.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -244,7 +245,8 @@ CAccessibleText::get_textBeforeOffset(long aOffset,
   *aStartOffset = startOffset;
   *aEndOffset = endOffset;
 
-  return ::SysReAllocStringLen(aText, text.get(), text.Length());
+  INT result = ::SysReAllocStringLen(aText, text.get(), text.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -277,7 +279,8 @@ CAccessibleText::get_textAfterOffset(long aOffset,
   *aStartOffset = startOffset;
   *aEndOffset = endOffset;
 
-  return ::SysReAllocStringLen(aText, text.get(), text.Length());
+  INT result = ::SysReAllocStringLen(aText, text.get(), text.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -310,7 +313,8 @@ CAccessibleText::get_textAtOffset(long aOffset,
   *aStartOffset = startOffset;
   *aEndOffset = endOffset;
 
-  return ::SysReAllocStringLen(aText, text.get(), text.Length());
+  INT result = ::SysReAllocStringLen(aText, text.get(), text.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -425,7 +429,8 @@ CAccessibleText::GetModifiedText(PRBool aGetInsertedText,
   aText->start = startOffset;
   aText->end = endOffset;
 
-  return ::SysReAllocStringLen(&(aText->text), text.get(), text.Length());
+  INT result = ::SysReAllocStringLen(&(aText->text), text.get(), text.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 nsAccessibleTextBoundary
diff --git a/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp
index 522945aadea..e1e350182df 100755
--- a/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp
@@ -81,7 +81,8 @@ nsApplicationAccessibleWrap::get_appName(BSTR *aName)
     return E_FAIL;
 
   NS_ConvertUTF8toUTF16 name(cname);
-  return ::SysReAllocStringLen(aName, name.get(), name.Length());
+  INT result = ::SysReAllocStringLen(aName, name.get(), name.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -97,7 +98,8 @@ nsApplicationAccessibleWrap::get_appVersion(BSTR *aVersion)
     return E_FAIL;
 
   NS_ConvertUTF8toUTF16 version(cversion);
-  return ::SysReAllocStringLen(aVersion, version.get(), version.Length());
+  INT result = ::SysReAllocStringLen(aVersion, version.get(), version.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 STDMETHODIMP
@@ -119,7 +121,8 @@ nsApplicationAccessibleWrap::get_toolkitVersion(BSTR *aVersion)
     return E_FAIL;
 
   NS_ConvertUTF8toUTF16 version(cversion);
-  return ::SysReAllocStringLen(aVersion, version.get(), version.Length());
+  INT result = ::SysReAllocStringLen(aVersion, version.get(), version.Length());
+  return result ? NS_OK : E_OUTOFMEMORY;
 }
 
 // nsApplicationAccessibleWrap