From 9de0b430f3285dceaa055f8458fb2ad3e72c9450 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Tue, 18 Jul 2006 18:20:07 +0000 Subject: [PATCH] Bug 317829, r=beng. Support annotation-based queries. Original committer: brettw%gmail.com Original revision: 1.33 Original date: 2006/01/25 01:36:46 --- toolkit/components/places/src/nsNavHistoryResult.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolkit/components/places/src/nsNavHistoryResult.cpp b/toolkit/components/places/src/nsNavHistoryResult.cpp index 7030efd5a2d9..f1b50af409cb 100644 --- a/toolkit/components/places/src/nsNavHistoryResult.cpp +++ b/toolkit/components/places/src/nsNavHistoryResult.cpp @@ -1336,7 +1336,10 @@ nsNavHistoryQueryResultNode::VerifyQueriesParsed() getter_AddRefs(options)); NS_ENSURE_SUCCESS(rv, rv); mOptions = do_QueryInterface(options, &rv); // need concrete pointer - NS_ENSURE_SUCCESS(rv, rv); + if (NS_FAILED(rv)) { + nsMemory::Free(queries); + return rv; + } // Copy the individual queries into our array. At the same time, note if // we have any bookmark components so we know whether to pay attention to