diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:06:51 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:06:51 +0000 |
| commit | b1c4b7c58fb67ae83d51de7e740f52b11de7d6d6 (patch) | |
| tree | f86d37d009ea1658a8feda28ab56b678fb872925 /base/clipboard_win.cc | |
| parent | a6ba0d2c133825c97c935cc9e0bec04d2b27c4bb (diff) | |
| download | chromium_src-b1c4b7c58fb67ae83d51de7e740f52b11de7d6d6.zip chromium_src-b1c4b7c58fb67ae83d51de7e740f52b11de7d6d6.tar.gz chromium_src-b1c4b7c58fb67ae83d51de7e740f52b11de7d6d6.tar.bz2 | |
Fix a FORWARD_NULL defect reported by Coverity. We should
allow the src_url argument of Clipboard::ReadHTML and the
html and base_url arguments of ClipboardUtil::CFHtmlToHtml
to be NULL.
Fix nits reported by cpplint.py.
In Clipboard::SetGtkClipboard, use strdup to duplicate
strings.
R=tony
BUG=http://crbug.com/17101
TEST=none
Review URL: http://codereview.chromium.org/160247
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/clipboard_win.cc')
| -rw-r--r-- | base/clipboard_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/clipboard_win.cc b/base/clipboard_win.cc index 684bec6..371e8f5 100644 --- a/base/clipboard_win.cc +++ b/base/clipboard_win.cc @@ -447,8 +447,10 @@ void Clipboard::ReadHTML(string16* markup, std::string* src_url) const { ::GlobalUnlock(data); std::string markup_utf8; - ClipboardUtil::CFHtmlToHtml(html_fragment, &markup_utf8, src_url); - markup->assign(UTF8ToWide(markup_utf8)); + ClipboardUtil::CFHtmlToHtml(html_fragment, markup ? &markup_utf8 : NULL, + src_url); + if (markup) + markup->assign(UTF8ToWide(markup_utf8)); } void Clipboard::ReadBookmark(string16* title, std::string* url) const { |