Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some regressions from bug 317878, r=brettw.

Browse Source 
Original committer: bryner%brianryner.com
Original revision: 1.19
Original date: 2005/11/29 17:12:02
This commit is contained in:
benjamin%smedbergs.us 2006-07-18 16:04:43 +00:00
parent d01fafb86c
commit 2881d28f19
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolkit/components/places/src/nsNavHistory.cpp
View File

@ -1068,6 +1068,9 @@ nsNavHistory::ExecuteQueries(nsINavHistoryQuery** aQueries, PRUint32 aQueryCount
nsINavHistoryQueryOptions *aOptions,
nsINavHistoryResult** _retval)
{
NS_ENSURE_ARG_POINTER(aQueries);
NS_ENSURE_ARG_POINTER(aOptions);
nsresult rv;
nsCOMPtr<nsNavHistoryQueryOptions> options = do_QueryInterface(aOptions);
@ -3506,12 +3509,15 @@ NS_IMETHODIMP nsNavHistoryQuery::GetFolders(PRUint32 *aCount,
PRInt64 **aFolders)
{
PRUint32 count = mFolders.Length();
PRInt64 *folders =
NS_STATIC_CAST(PRInt64*, nsMemory::Alloc(count * sizeof(PRInt64)));
NS_ENSURE_TRUE(folders, NS_ERROR_OUT_OF_MEMORY);
PRInt64 *folders = nsnull;
if (count > 0) {
folders = NS_STATIC_CAST(PRInt64*,
nsMemory::Alloc(count * sizeof(PRInt64)));
NS_ENSURE_TRUE(folders, NS_ERROR_OUT_OF_MEMORY);
for (PRUint32 i = 0; i < count; ++i) {
folders[i] = mFolders[i];
for (PRUint32 i = 0; i < count; ++i) {
folders[i] = mFolders[i];
}
}
*aCount = count;
*aFolders = folders;