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

1 files changed, 26 insertions, 23 deletions

diff --git a/base/clipboard_util.cc b/base/clipboard_util.cc
index 3fd07c0..74f34e3 100644
--- a/base/clipboard_util.cc
+++ b/base/clipboard_util.cc
@@ -107,8 +107,7 @@ FORMATETC* ClipboardUtil::GetFilenameWFormat() {
   return &format;
 }
 
-FORMATETC* ClipboardUtil::GetFilenameFormat()
-{
+FORMATETC* ClipboardUtil::GetFilenameFormat() {
   static UINT cf = RegisterClipboardFormat(CFSTR_FILENAMEA);
   static FORMATETC format = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
   return &format;
@@ -300,8 +299,8 @@ bool ClipboardUtil::GetPlainText(IDataObject* data_object,
     ReleaseStgMedium(&store);
     success = true;
   } else {
-    //If a file is dropped on the window, it does not provide either of the
-    //plain text formats, so here we try to forcibly get a url.
+    // If a file is dropped on the window, it does not provide either of the
+    // plain text formats, so here we try to forcibly get a url.
     std::wstring title;
     success = GetUrl(data_object, plain_text, &title);
   }
@@ -368,7 +367,7 @@ bool ClipboardUtil::GetFileContents(IDataObject* data_object,
                                      &description))) {
     ScopedHGlobal<FILEGROUPDESCRIPTOR> fgd(description.hGlobal);
     // We expect there to be at least one file in here.
-    DCHECK(fgd->cItems >= 1);
+    DCHECK_GE(fgd->cItems, 1);
     filename->assign(fgd->fgd[0].cFileName);
     ReleaseStgMedium(&description);
   }
@@ -462,27 +461,31 @@ void ClipboardUtil::CFHtmlToHtml(const std::string& cf_html,
                                  std::string* html,
                                  std::string* base_url) {
   // Obtain base_url if present.
-  static std::string src_url_str("SourceURL:");
-  size_t line_start = cf_html.find(src_url_str);
-  if (line_start != std::string::npos) {
-    size_t src_end = cf_html.find("\n", line_start);
-    size_t src_start = line_start + src_url_str.length();
-    if (src_end != std::string::npos && src_start != std::string::npos) {
-      *base_url = cf_html.substr(src_start, src_end - src_start);
-      TrimWhitespace(*base_url, TRIM_ALL, base_url);
+  if (base_url) {
+    static std::string src_url_str("SourceURL:");
+    size_t line_start = cf_html.find(src_url_str);
+    if (line_start != std::string::npos) {
+      size_t src_end = cf_html.find("\n", line_start);
+      size_t src_start = line_start + src_url_str.length();
+      if (src_end != std::string::npos && src_start != std::string::npos) {
+        *base_url = cf_html.substr(src_start, src_end - src_start);
+        TrimWhitespace(*base_url, TRIM_ALL, base_url);
+      }
     }
   }
 
   // Find the markup between "<!--StartFragment -->" and "<!--EndFragment-->".
-  std::string cf_html_lower = StringToLowerASCII(cf_html);
-  size_t markup_start = cf_html_lower.find("<html", 0);
-  size_t tag_start = cf_html.find("StartFragment", markup_start);
-  size_t fragment_start = cf_html.find('>', tag_start) + 1;
-  size_t tag_end = cf_html.rfind("EndFragment", std::string::npos);
-  size_t fragment_end = cf_html.rfind('<', tag_end);
-  if (fragment_start != std::string::npos &&
-      fragment_end != std::string::npos) {
-    *html = cf_html.substr(fragment_start, fragment_end - fragment_start);
-    TrimWhitespace(*html, TRIM_ALL, html);
+  if (html) {
+    std::string cf_html_lower = StringToLowerASCII(cf_html);
+    size_t markup_start = cf_html_lower.find("<html", 0);
+    size_t tag_start = cf_html.find("StartFragment", markup_start);
+    size_t fragment_start = cf_html.find('>', tag_start) + 1;
+    size_t tag_end = cf_html.rfind("EndFragment", std::string::npos);
+    size_t fragment_end = cf_html.rfind('<', tag_end);
+    if (fragment_start != std::string::npos &&
+        fragment_end != std::string::npos) {
+      *html = cf_html.substr(fragment_start, fragment_end - fragment_start);
+      TrimWhitespace(*html, TRIM_ALL, html);
+    }
   }
 }