From 68b48a504ef405281e9c1a9b929d737d574d4458 Mon Sep 17 00:00:00 2001
From: "caillon%returnzero.com"
 <caillon%returnzero.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 24 Jul 2003 02:43:32 +0000
Subject: [PATCH] Bug 213595 - Check for OOM.  r=bzbarsky@mit.edu
 sr=darin@meer.net

git-svn-id: svn://10.0.0.236/trunk@145134 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 563cae3fa83..4446efb47ea 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -1340,6 +1340,9 @@ nsDocShell::GetCharset(char** aCharset)
     nsCAutoString charset;
     NS_ENSURE_SUCCESS(doc->GetDocumentCharacterSet(charset), NS_ERROR_FAILURE);
     *aCharset = ToNewCString(charset);
+    if (!*aCharset) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
 
     return NS_OK;
 }
@@ -5788,6 +5791,9 @@ nsDocShell::ScrollIfAnchor(nsIURI * aURI, PRBool * aWasAnchor,
                         aLoadType != LOAD_RELOAD_NORMAL;
 
         char *str = ToNewCString(sNewRef);
+        if (!str) {
+            return NS_ERROR_OUT_OF_MEMORY;
+        }
 
         // nsUnescape modifies the string that is passed into it.
         nsUnescape(str);