From 34e46aa9ed94c8657e3da8db4b1dc765dd035cf9 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 19 Jul 2005 21:03:04 +0000
Subject: [PATCH] Bug 284889 OOM crash [@nsStyleContext::ApplyStyleFixups]
 patch by b.jacques@planet.nl r=dbaron sr=dbaron a=bsmedberg

git-svn-id: svn://10.0.0.236/trunk@176260 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/style/nsStyleContext.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index 36f67c57142..6b26bfdc21c 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/layout/style/nsStyleContext.cpp
@@ -308,6 +308,12 @@ nsStyleContext::GetUniqueStyleData(const nsStyleStructID& aSID)
     return nsnull;
   }
 
+  if (!result) {
+    NS_WARNING("Ran out of memory while trying to allocate memory for a unique nsStyleStruct! "
+               "Returning the non-unique data.");
+    return NS_CONST_CAST(nsStyleStruct*, current);
+  }
+
   SetStyle(aSID, result);
   mBits &= ~nsCachedStyleData::GetBitForSID(aSID);