summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 01:21:03 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 01:21:03 +0000
commit62a71e3a72f65ac83d46d6dc046960dfec4e1036 (patch)
treee33b4626f68bd8cd20dd748233cc9f275ddd9891
parent35beff56cf90ddd1ca213a20fb17b80b4faad696 (diff)
downloadchromium_src-62a71e3a72f65ac83d46d6dc046960dfec4e1036.zip
chromium_src-62a71e3a72f65ac83d46d6dc046960dfec4e1036.tar.gz
chromium_src-62a71e3a72f65ac83d46d6dc046960dfec4e1036.tar.bz2
importer: Make const strings static and move them outside the function.
Reason: it does a memcpy on the stack. BUG=None TEST=None R=avi@chromium.org,maruel@chromium.org Review URL: http://codereview.chromium.org/6730002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79232 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/importer/firefox2_importer.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index e6aae3c..c20e5a7 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -31,6 +31,15 @@
#include "net/base/data_url.h"
#include "webkit/glue/password_form.h"
+static const char kItemOpen[] = "<DT><A";
+static const char kItemClose[] = "</A>";
+static const char kFeedURLAttribute[] = "FEEDURL";
+static const char kHrefAttribute[] = "HREF";
+static const char kIconAttribute[] = "ICON";
+static const char kShortcutURLAttribute[] = "SHORTCUTURL";
+static const char kAddDateAttribute[] = "ADD_DATE";
+static const char kPostDataAttribute[] = "POST_DATA";
+
Firefox2Importer::Firefox2Importer() : parsing_bookmarks_html_file_(false) {}
Firefox2Importer::~Firefox2Importer() {}
@@ -456,15 +465,6 @@ bool Firefox2Importer::ParseBookmarkFromLine(const std::string& line,
std::wstring* shortcut,
base::Time* add_date,
std::wstring* post_data) {
- const char kItemOpen[] = "<DT><A";
- const char kItemClose[] = "</A>";
- const char kFeedURLAttribute[] = "FEEDURL";
- const char kHrefAttribute[] = "HREF";
- const char kIconAttribute[] = "ICON";
- const char kShortcutURLAttribute[] = "SHORTCUTURL";
- const char kAddDateAttribute[] = "ADD_DATE";
- const char kPostDataAttribute[] = "POST_DATA";
-
title->clear();
*url = GURL();
*favicon = GURL();