From 6f47a41cd7072076b0ac60406520f5bb740700e0 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 27 Mar 2012 08:47:14 -0400
Subject: [PATCH] Bug 738976 - java.lang.NullPointerException at
 org.mozilla.gecko.db.LocalBrowserDB.updateFaviconForUrl r=blassey

---
 mobile/android/base/db/LocalBrowserDB.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java
index 1dfc21137b3..e0dc8b78eb7 100644
--- a/mobile/android/base/db/LocalBrowserDB.java
+++ b/mobile/android/base/db/LocalBrowserDB.java
@@ -593,6 +593,8 @@ public class LocalBrowserDB implements BrowserDB.BrowserDBIface {
     public void updateFaviconForUrl(ContentResolver cr, String uri,
             BitmapDrawable favicon) {
         Bitmap bitmap = favicon.getBitmap();
+        if (bitmap == null)
+            return;
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);