From 9f3c489fc28e8bca0b5bc5b2c2a020cae20ad6a8 Mon Sep 17 00:00:00 2001
From: "brettw%gmail.com"
 <brettw%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 4 Jan 2006 19:12:32 +0000
Subject: [PATCH] Bug 322378 r=bryner Fixed crash while pasting bookmarks.

git-svn-id: svn://10.0.0.236/trunk@186929 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/components/places/src/nsNavHistory.cpp       | 1 +
 mozilla/browser/components/places/src/nsNavHistoryResult.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/browser/components/places/src/nsNavHistory.cpp b/mozilla/browser/components/places/src/nsNavHistory.cpp
index 7e6f9ae6639..5255aa13808 100644
--- a/mozilla/browser/components/places/src/nsNavHistory.cpp
+++ b/mozilla/browser/components/places/src/nsNavHistory.cpp
@@ -2657,6 +2657,7 @@ nsNavHistory::RowToResult(mozIStorageValueArray* aRow,
                           nsNavHistoryResultNode** aResult)
 {
   *aResult = nsnull;
+  NS_ASSERTION(aRow && aOptions && aResult, "Null pointer in RowToResult");
 
   nsCAutoString spec;
   nsresult rv = aRow->GetUTF8String(kGetInfoIndex_URL, spec);
diff --git a/mozilla/browser/components/places/src/nsNavHistoryResult.cpp b/mozilla/browser/components/places/src/nsNavHistoryResult.cpp
index 2c1c0e3cddf..874a6afb194 100755
--- a/mozilla/browser/components/places/src/nsNavHistoryResult.cpp
+++ b/mozilla/browser/components/places/src/nsNavHistoryResult.cpp
@@ -600,7 +600,7 @@ nsNavHistoryQueryNode::CreateNode(nsIURI *aBookmark,
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ASSERTION(results, "item must be in history!");
 
-  return history->RowToResult(statement, PR_FALSE, aNode);
+  return history->RowToResult(statement, mOptions, aNode);
 }
 
 PRBool