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

Bug 385771 - disallow item-annotations for invalid item ids. r=dietrich.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@228732 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com 2007-06-26 01:08:55 +00:00
parent 67c6fcce02
commit 6e42869ab3
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/toolkit/components/places/src/nsAnnotationService.cpp
View File

@ -49,6 +49,7 @@
#include "nsIVariant.h"
#include "nsString.h"
#include "nsVariant.h"
#include "nsNavBookmarks.h"
const PRInt32 nsAnnotationService::kAnnoIndex_ID = 0;
const PRInt32 nsAnnotationService::kAnnoIndex_PageOrItem = 1;
@ -1624,6 +1625,14 @@ nsAnnotationService::StartSetAnnotation(PRInt64 aFkId,
PRUint16 aType,
mozIStorageStatement** aStatement)
{
// Disallow setting item-annotations on invalid item ids
if (aIsItemAnnotation) {
nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
NS_ENSURE_STATE(bookmarks);
if (!bookmarks->ItemExists(aFkId))
return NS_ERROR_INVALID_ARG;
}
PRBool hasAnnotation;
PRInt64 annotationID;
nsresult rv = HasAnnotationInternal(aFkId, aIsItemAnnotation, aName,

16
mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
View File

@ -2594,3 +2594,19 @@ nsNavBookmarks::OnItemAnnotationRemoved(PRInt64 aItemId, const nsACString& aName
return NS_OK;
}
PRBool
nsNavBookmarks::ItemExists(PRInt64 aItemId) {
mozStorageStatementScoper scope(mDBGetItemProperties);
nsresult rv = mDBGetItemProperties->BindInt64Parameter(0, aItemId);
NS_ENSURE_SUCCESS(rv, PR_FALSE);
PRBool results;
rv = mDBGetItemProperties->ExecuteStep(&results);
NS_ENSURE_SUCCESS(rv, PR_FALSE);
if (!results)
return PR_FALSE;
return PR_TRUE;
}

2
mozilla/toolkit/components/places/src/nsNavBookmarks.h
View File

@ -110,6 +110,8 @@ public:
nsresult BeginUpdateBatch();
nsresult EndUpdateBatch();
PRBool ItemExists(PRInt64 aItemId);
private:
static nsNavBookmarks *sInstance;

10
mozilla/toolkit/components/places/tests/unit/test_annotations.js
View File

@ -355,5 +355,15 @@ function run_test() {
do_check_eq(annosvc.getItemsWithAnnotation(int32Key, { }).length, 0);
do_check_eq(annosvc.getPagesWithAnnotation(int32Key, { }).length, 0);
// Setting item annotations on invalid item ids should throw
var invalidIds = [-1, 0, 37643];
for each (var id in invalidIds) {
try {
annosvc.setItemAnnotationString(id, "foo", "bar", 0, 0);
do_throw("setItemAnnotation* should throw for invalid item id: " + id)
}
catch(ex) { }
}
annosvc.removeObserver(annoObserver);
}