diff --git a/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp b/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp index 9025bf5d9db..2649b74d011 100644 --- a/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp +++ b/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp @@ -329,6 +329,8 @@ nsPlacesImportExportService::~nsPlacesImportExportService() class BookmarkContentSink : public nsIHTMLContentSink { public: + BookmarkContentSink(); + nsresult Init(PRBool aAllowRootChanges, nsINavBookmarksService* bookmarkService, PRInt64 aFolder, @@ -436,6 +438,10 @@ protected: #endif }; +BookmarkContentSink::BookmarkContentSink() : mFrames(16) +{ +} + // BookmarkContentSink::Init // // Note that the bookmark service pointer is passed in. We can not create @@ -1222,9 +1228,11 @@ BookmarkContentSink::NewFrame() // don't clear last-modified, in case there's a description } + frame.mPreviousId = ourID; + if (!mFrames.AppendElement(BookmarkImportFrame(ourID))) return NS_ERROR_OUT_OF_MEMORY; - frame.mPreviousId = ourID; + return NS_OK; }