From 726d411d2b5ecc530f334322dd0471310fcf35da Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Wed, 13 Mar 2013 14:45:22 -0700
Subject: [PATCH] Bug 850873 - Fix null-checking in
 JS_NewArrayBufferWithContents. r=Waldo

---
 js/src/jstypedarray.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index e6e05266386e..1360be0ad5a9 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -3725,9 +3725,10 @@ JS_NewArrayBuffer(JSContext *cx, uint32_t nbytes)
 JS_PUBLIC_API(JSObject *)
 JS_NewArrayBufferWithContents(JSContext *cx, void *contents)
 {
-    if (!contents)
-        return NULL;
+    JS_ASSERT(contents);
     JSObject *obj = ArrayBufferObject::create(cx, 0);
+    if (!obj)
+        return NULL;
     obj->setDynamicElements(reinterpret_cast<js::ObjectElements *>(contents));
     JS_ASSERT(*GetViewList(&obj->asArrayBuffer()) == NULL);
     return obj;