From bfaa2dc2184fa55305df19f6e682ed7ff3cb6aa8 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Fri, 5 Mar 2010 16:29:44 -0600
Subject: [PATCH] In case of OOM in DEBUG build, don't crash. No bug,
 rs=jwalden via IRC.

--HG--
extra : rebase_source : c08508a93d1c1a98606dc1c7c8d9c08c57e17cad
---
 js/src/jsobj.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index e63105d74d2..498c6357e26 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2902,8 +2902,10 @@ js_NewObjectWithGivenProto(JSContext *cx, JSClass *clasp, JSObject *proto,
     if (clasp == &js_FunctionClass && !objectSize) {
         obj = (JSObject*) js_NewGCFunction(cx);
 #ifdef DEBUG
-        memset((uint8 *) obj + sizeof(JSObject), JS_FREE_PATTERN,
-               sizeof(JSFunction) - sizeof(JSObject));
+        if (obj) {
+            memset((uint8 *) obj + sizeof(JSObject), JS_FREE_PATTERN,
+                   sizeof(JSFunction) - sizeof(JSObject));
+        }
 #endif
     } else {
         JS_ASSERT(!objectSize || objectSize == sizeof(JSObject));