From 9910bea99a7bf8678a876d3d318ff87d6f89ae0e Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Thu, 16 Jan 2014 15:24:00 +0100
Subject: [PATCH] Bug 939294 - Fix b2g failure with null JSObject. r=bz on irc

---
 dom/camera/DOMCameraCapabilities.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dom/camera/DOMCameraCapabilities.cpp b/dom/camera/DOMCameraCapabilities.cpp
index 00e681914178..b1396ec5766b 100644
--- a/dom/camera/DOMCameraCapabilities.cpp
+++ b/dom/camera/DOMCameraCapabilities.cpp
@@ -170,7 +170,7 @@ DOMCameraCapabilities::StringListToNewObject(JSContext* aCx,
   nsresult rv = ParameterListToNewArray(aCx, &array, aKey, ParseStringItemAndAdd);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aArray.setObject(*array);
+  aArray.setObjectOrNull(array);
   return NS_OK;
 }
 
@@ -184,7 +184,7 @@ DOMCameraCapabilities::DimensionListToNewObject(JSContext* aCx,
   nsresult rv = ParameterListToNewArray(aCx, &array, aKey, ParseDimensionItemAndAdd);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aArray.setObject(*array);
+  aArray.setObjectOrNull(array);
   return NS_OK;
 }
 
@@ -363,7 +363,7 @@ DOMCameraCapabilities::GetZoomRatios(JSContext* cx, JS::MutableHandle<JS::Value>
   nsresult rv = ParameterListToNewArray(cx, &array, CAMERA_PARAM_SUPPORTED_ZOOMRATIOS, ParseZoomRatioItemAndAdd);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aZoomRatios.setObject(*array);
+  aZoomRatios.setObjectOrNull(array);
   return NS_OK;
 }