From a69e0b9f81c2c910dfbdfdf75d63f522de0f8c42 Mon Sep 17 00:00:00 2001 From: "pinkerton%aol.net" Date: Fri, 30 Dec 2005 17:48:36 +0000 Subject: [PATCH] fix crash for feeds that don't have an href (bug 321886) --- camino/src/bookmarks/BookmarkManager.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camino/src/bookmarks/BookmarkManager.mm b/camino/src/bookmarks/BookmarkManager.mm index ccb0bd9e3c8..fe15e56e37c 100644 --- a/camino/src/bookmarks/BookmarkManager.mm +++ b/camino/src/bookmarks/BookmarkManager.mm @@ -1443,7 +1443,7 @@ static BookmarkManager* gBookmarkManager = nil; tokenScanner = [[NSScanner alloc] initWithString:tokenString]; [tokenScanner scanUpToString:@"href=\"" intoString:nil]; // tokenScanner now contains HREF="[URL]">[TITLE] // check for a menu spacer, which will look like this: HREF=""><Menu Spacer> (bug 309008) - if ([[tokenString substringFromIndex:([tokenScanner scanLocation]+8)] isEqualToString:@"<Menu Spacer>"]) { + if (![tokenScanner isAtEnd] && [[tokenString substringFromIndex:([tokenScanner scanLocation]+8)] isEqualToString:@"<Menu Spacer>"]) { currentItem = [currentArray addBookmark]; [(Bookmark *)currentItem setIsSeparator:YES]; [tokenScanner release];