| Index: chrome/browser/history/history_publisher_win.cc
|
| ===================================================================
|
| --- chrome/browser/history/history_publisher_win.cc (revision 54815)
|
| +++ chrome/browser/history/history_publisher_win.cc (working copy)
|
| @@ -120,7 +120,10 @@
|
| ScopedBstr url(ASCIIToWide(page_data.url.spec()).c_str());
|
| ScopedBstr html(page_data.html);
|
| ScopedBstr title(page_data.title);
|
| - ScopedBstr format(ASCIIToWide(page_data.thumbnail_format).c_str());
|
| + // Don't send a NULL string through ASCIIToWide.
|
| + ScopedBstr format(page_data.thumbnail_format ?
|
| + ASCIIToWide(page_data.thumbnail_format).c_str() :
|
| + NULL);
|
| ScopedVariant psa(thumbnail_arr.m_psa);
|
| for (size_t i = 0; i < indexers_.size(); ++i) {
|
| indexers_[i]->SendPageData(time, url, html, title, format, psa);
|
|
|