From cddbe1b4c83663d64351557601bb99559d3d1a8d Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us" <benjamin%smedbergs.us>
Date: Tue, 18 Jul 2006 16:53:47 +0000
Subject: [PATCH] Bug 336990 r=bryner Deleting a livemark causes bookmarks to
 disappear - make annotation service more tolerant of errors

Original committer: brettw%gmail.com
Original revision: 1.15
Original date: 2006/06/19 16:23:56
---
 toolkit/components/places/src/nsAnnotationService.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/places/src/nsAnnotationService.cpp b/toolkit/components/places/src/nsAnnotationService.cpp
index afebe7cac21f..e7f6950f1ef5 100644
--- a/toolkit/components/places/src/nsAnnotationService.cpp
+++ b/toolkit/components/places/src/nsAnnotationService.cpp
@@ -557,9 +557,12 @@ nsAnnotationService::GetPagesWithAnnotationCOMArray(
     rv = statement->GetUTF8String(0, uristring);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    // convert to a URI, in case of some invalid URI, just ignore this row
+    // so we can mostly continue.
     nsCOMPtr<nsIURI> uri;
     rv = NS_NewURI(getter_AddRefs(uri), uristring);
-    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_FAILED(rv))
+      continue;
     PRBool added = aResults->AppendObject(uri);
     NS_ENSURE_TRUE(added, NS_ERROR_OUT_OF_MEMORY);
   }