From 57c48cf12dfacb46a55cceffd8c63081a330420f Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Tue, 27 Nov 2012 22:54:39 -0800
Subject: [PATCH] Bug 809259: Properly handle allocation failures. r=kanru

---
 dom/camera/GonkNativeWindow.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dom/camera/GonkNativeWindow.cpp b/dom/camera/GonkNativeWindow.cpp
index e6b412946df9..785714645389 100644
--- a/dom/camera/GonkNativeWindow.cpp
+++ b/dom/camera/GonkNativeWindow.cpp
@@ -263,11 +263,15 @@ int GonkNativeWindow::dequeueBuffer(android_native_buffer_t** buffer)
                                            mPixelFormat,
                                            mUsage,
                                            &buffer);
-        sp<GraphicBuffer> graphicBuffer =
-          GrallocBufferActor::GetFrom(buffer.get_SurfaceDescriptorGralloc());
-        if (!graphicBuffer.get()) {
+        // We can only use a gralloc buffer here.  If we didn't get
+        // one back, something went wrong.
+        if (SurfaceDescriptor::TSurfaceDescriptorGralloc != buffer.type()) {
+            MOZ_ASSERT(SurfaceDescriptor::T__None == buffer.type());
+            CNW_LOGE("dequeueBuffer: failed to alloc gralloc buffer");
             return -ENOMEM;
         }
+        sp<GraphicBuffer> graphicBuffer =
+          GrallocBufferActor::GetFrom(buffer.get_SurfaceDescriptorGralloc());
         error = graphicBuffer->initCheck();
         if (error != NO_ERROR) {
             CNW_LOGE("dequeueBuffer: createGraphicBuffer failed with error %d",error);