Bug 485442 - crash bug calling nsINavHistoryQuery.uri, r=mak,sdwilsh
authorDavid Dahl <ddahl@mozilla.com>
Fri, 17 Apr 2009 14:42:39 +0200
changeset 27433 49ba14fac398e555a39756d0c9e8b6ca1550dfa1
parent 27432 d348393c7711e78508e5a1906584484626ca259f
child 27434 bba6f7ba14d20902784281e4a88ed81451385c16
push id6555
push usermak77@bonardo.net
push dateFri, 17 Apr 2009 12:43:45 +0000
treeherdermozilla-central@49ba14fac398 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak, sdwilsh
bugs485442
milestone1.9.2a1pre
Bug 485442 - crash bug calling nsINavHistoryQuery.uri, r=mak,sdwilsh
toolkit/components/places/src/nsNavHistoryQuery.cpp
toolkit/components/places/tests/unit/test_485442_crash_bug_nsNavHistoryQuery_GetUri.js
--- a/toolkit/components/places/src/nsNavHistoryQuery.cpp
+++ b/toolkit/components/places/src/nsNavHistoryQuery.cpp
@@ -1064,18 +1064,17 @@ NS_IMETHODIMP nsNavHistoryQuery::SetUriI
 {
   mUriIsPrefix = aIsPrefix;
   return NS_OK;
 }
 
 /* attribute nsIURI uri; */
 NS_IMETHODIMP nsNavHistoryQuery::GetUri(nsIURI** aUri)
 {
-  *aUri = mUri;
-  NS_ADDREF(*aUri);
+  NS_IF_ADDREF(*aUri = mUri);
   return NS_OK;
 }
 NS_IMETHODIMP nsNavHistoryQuery::SetUri(nsIURI* aUri)
 {
   mUri = aUri;
   return NS_OK;
 }
 NS_IMETHODIMP nsNavHistoryQuery::GetHasUri(PRBool* aHasUri)
new file mode 100644
--- /dev/null
+++ b/toolkit/components/places/tests/unit/test_485442_crash_bug_nsNavHistoryQuery_GetUri.js
@@ -0,0 +1,54 @@
+/* -*- Mode: js2; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.com code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  David Dahl  <ddahl@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
+         getService(Ci.nsINavHistoryService);
+
+function run_test() {
+  var query = hs.getNewQuery();
+  var options = hs.getNewQueryOptions();
+  options.resultType = options.RESULT_TYPE_QUERY;
+  var result = hs.executeQuery(query, options);
+  result.root.containerOpen = true;
+  var rootNode = result.root;
+  rootNode.QueryInterface(Ci.nsINavHistoryQueryResultNode);
+  var outObj = {};
+  var queries = rootNode.getQueries(outObj);
+  do_check_eq(queries[0].uri, null); // Should be null, instead of crashing the browser
+  rootNode.containerOpen = false;
+}