From dc671accb2ea3aa7ef888ab4afe246e030649e67 Mon Sep 17 00:00:00 2001
From: Christian Holler <choller@mozilla.com>
Date: Mon, 13 Jan 2014 15:41:43 +0100
Subject: [PATCH] Bug 959167 - Handle OOM in js::CloneRegExpObject. r=jandem

--HG--
extra : rebase_source : 22b04af4ecfc73b591c1460f4ac7f4d8343002f3
---
 js/src/vm/RegExpObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
index c00ac5658b7..f52e9a0d7e8 100644
--- a/js/src/vm/RegExpObject.cpp
+++ b/js/src/vm/RegExpObject.cpp
@@ -795,7 +795,7 @@ js::CloneRegExpObject(JSContext *cx, JSObject *obj_)
     RegExpObjectBuilder builder(cx);
     Rooted<RegExpObject*> regex(cx, &obj_->as<RegExpObject>());
     JSObject *res = builder.clone(regex);
-    JS_ASSERT(res->type() == regex->type());
+    JS_ASSERT_IF(res, res->type() == regex->type());
     return res;
 }