Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9322)

Unified Diff: chrome/common/extensions/extension.cc

Issue 10833014: Coverity fixlet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Uploaded after rebasing. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 99ad3f7f50e243b3487c812072fbe7ea5c6ec0ec..e5860e104ff7c1067ee958f880c2ac6ec01ea040 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -372,7 +372,8 @@ void Extension::OverrideLaunchUrl(const GURL& override_url) {
launch_web_url_ = new_url.spec();
URLPattern pattern(kValidWebExtentSchemes);
- pattern.Parse(new_url.spec());
+ URLPattern::ParseResult result = pattern.Parse(new_url.spec());
+ DCHECK_EQ(result, URLPattern::PARSE_SUCCESS);
pattern.SetPath(pattern.path() + '*');
extent_.AddPattern(pattern);
}
@@ -1610,7 +1611,11 @@ bool Extension::LoadWebAccessibleResources(string16* error) {
return false;
}
URLPattern pattern(URLPattern::SCHEME_EXTENSION);
- pattern.Parse(extension_url_.spec());
+ if (pattern.Parse(extension_url_.spec()) != URLPattern::PARSE_SUCCESS) {
+ *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ errors::kInvalidURLPatternError, extension_url_.spec());
+ return false;
+ }
while (relative_path[0] == '/')
relative_path = relative_path.substr(1, relative_path.length() - 1);
pattern.SetPath(pattern.path() + relative_path);
@@ -1637,7 +1642,11 @@ bool Extension::LoadSandboxedPages(string16* error) {
return false;
}
URLPattern pattern(URLPattern::SCHEME_EXTENSION);
- pattern.Parse(extension_url_.spec());
+ if (pattern.Parse(extension_url_.spec()) != URLPattern::PARSE_SUCCESS) {
+ *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ errors::kInvalidURLPatternError, extension_url_.spec());
+ return false;
+ }
while (relative_path[0] == '/')
relative_path = relative_path.substr(1, relative_path.length() - 1);
pattern.SetPath(pattern.path() + relative_path);
@@ -2558,8 +2567,13 @@ bool Extension::LoadChromeURLOverrides(string16* error) {
// For component extensions, add override URL to extent patterns.
if (is_packaged_app() && location() == COMPONENT) {
URLPattern pattern(URLPattern::SCHEME_CHROMEUI);
- pattern.Parse(base::StringPrintf(kOverrideExtentUrlPatternFormat,
- page.c_str()));
+ std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,
+ page.c_str());
+ if (pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {
+ *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+ errors::kInvalidURLPatternError, url);
+ return false;
+ }
extent_.AddPattern(pattern);
}
}
@@ -3092,7 +3106,7 @@ bool Extension::InitFromValue(int flags, string16* error) {
if (!LoadRequiredFeatures(error))
return false;
- // We don't ned to validate because InitExtensionID already did that.
+ // We don't need to validate because InitExtensionID already did that.
manifest_->GetString(keys::kPublicKey, &public_key_);
extension_url_ = Extension::GetBaseURLFromExtensionId(id());
« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698