summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 23:57:53 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 23:57:53 +0000
commit5b20330abc0ee54fb6900785a263e3a82cdb8851 (patch)
tree46fee8a826c0ab7b6386a28dc2e2804ead0858f3
parent6277278dfc9fe6a5c1068fe355f3e072a4865151 (diff)
downloadchromium_src-5b20330abc0ee54fb6900785a263e3a82cdb8851.zip
chromium_src-5b20330abc0ee54fb6900785a263e3a82cdb8851.tar.gz
chromium_src-5b20330abc0ee54fb6900785a263e3a82cdb8851.tar.bz2
Make sure the pointer in PageData::html remains valid while PageData is called.
BUG=46835 Review URL: http://codereview.chromium.org/2852014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50173 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/history/history_publisher.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/history/history_publisher.cc b/chrome/browser/history/history_publisher.cc
index 769a186..2c70a31 100644
--- a/chrome/browser/history/history_publisher.cc
+++ b/chrome/browser/history/history_publisher.cc
@@ -29,10 +29,11 @@ void HistoryPublisher::PublishPageContent(const base::Time& time,
const GURL& url,
const std::wstring& title,
const string16& contents) const {
+ std::wstring wide_contents = UTF16ToWide(contents);
PageData page_data = {
time,
url,
- UTF16ToWide(contents).c_str(),
+ wide_contents.c_str(),
title.c_str(),
NULL,
NULL,