Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent bookmark folders from being parented to themselves or to a subfolder (bug 320653). r=brettw.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@186889 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com 2006-01-04 01:08:33 +00:00
parent 0e9db0223a
commit e73f4652d2
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/browser/components/places/src/nsNavBookmarks.cpp
View File

@ -848,18 +848,16 @@ nsNavBookmarks::MoveFolder(PRInt64 aFolder, PRInt64 aNewParent, PRInt32 aIndex)
mozIStorageConnection *dbConn = DBConn();
mozStorageTransaction transaction(dbConn, PR_FALSE);
nsCAutoString buffer;
buffer.AssignLiteral("SELECT parent, position FROM moz_bookmarks WHERE folder_child = ");
buffer.AppendInt(aFolder);
nsCOMPtr<mozIStorageStatement> statement;
nsresult rv = dbConn->CreateStatement(NS_LITERAL_CSTRING("SELECT parent, position FROM moz_bookmarks WHERE folder_child = ?1"),
getter_AddRefs(statement));
NS_ENSURE_SUCCESS(rv, rv);
nsresult rv;
PRInt64 parent;
PRInt32 oldIndex;
{
nsCOMPtr<mozIStorageStatement> statement;
rv = dbConn->CreateStatement(buffer, getter_AddRefs(statement));
mozStorageStatementScoper scope(statement);
rv = statement->BindInt64Parameter(0, aFolder);
NS_ENSURE_SUCCESS(rv, rv);
PRBool results;
@ -873,6 +871,26 @@ nsNavBookmarks::MoveFolder(PRInt64 aFolder, PRInt64 aNewParent, PRInt32 aIndex)
oldIndex = statement->AsInt32(1);
}
// Make sure aNewParent is not aFolder or a subfolder of aFolder
{
mozStorageStatementScoper scope(statement);
PRInt64 p = aNewParent;
while (p) {
if (p == aFolder) {
return NS_ERROR_INVALID_ARG;
}
rv = statement->BindInt64Parameter(0, p);
NS_ENSURE_SUCCESS(rv, rv);
PRBool results;
rv = statement->ExecuteStep(&results);
NS_ENSURE_SUCCESS(rv, rv);
p = results ? statement->AsInt64(0) : 0;
}
}
PRInt32 newIndex;
if (aIndex == -1) {
newIndex = FolderCount(aNewParent);
@ -898,6 +916,7 @@ nsNavBookmarks::MoveFolder(PRInt64 aFolder, PRInt64 aNewParent, PRInt32 aIndex)
}
// First we remove the item from its old position.
nsCAutoString buffer;
buffer.AssignLiteral("DELETE FROM moz_bookmarks WHERE folder_child = ");
buffer.AppendInt(aFolder);
rv = dbConn->ExecuteSimpleSQL(buffer);

5
mozilla/browser/components/places/tests/testbookmarks.js
View File

@ -258,6 +258,11 @@ if (observer._folderMoved != workFolder ||
observer._folderMovedNewIndex != 4) {
dump("moveFolder notification FAILED\n");
}
// Test expected failure of moving a folder to be its own parent
try {
bmsvc.moveFolder(workFolder, workFolder, -1);
dump("moveFolder parameter validation FAILED\n");
} catch (e) {}
if (bmsvc.indexOfItem(root, uri("http://google.com/")) != 1) {
dump("indexOfItem FAILED\n");
}