diff options
| author | vasilii@chromium.org <vasilii@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 01:34:50 +0000 |
|---|---|---|
| committer | vasilii@chromium.org <vasilii@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 01:34:50 +0000 |
| commit | aa08d608e217139a87779cab5b110bb41d440e8a (patch) | |
| tree | d20beda57037018a451c586ebb6b147b6eb86cc6 /extensions | |
| parent | ed0b0b4c778c576456a3fa15ad0f001b9124d1a1 (diff) | |
| download | chromium_src-aa08d608e217139a87779cab5b110bb41d440e8a.zip chromium_src-aa08d608e217139a87779cab5b110bb41d440e8a.tar.gz chromium_src-aa08d608e217139a87779cab5b110bb41d440e8a.tar.bz2 | |
Fix browser crash when parsing an Settings Override manifest with invalid URLs under 'chrome_settings_overrides.search_provider'.
BUG=
Review URL: https://codereview.chromium.org/71303009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/common/manifest_constants.cc | 2 | ||||
| -rw-r--r-- | extensions/common/manifest_constants.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc index 4f8236d..1f28f94 100644 --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.cc @@ -539,6 +539,8 @@ const char kInvalidSandboxedPagesCSP[] = "Invalid value for 'sandbox.content_security_policy'."; const char kInvalidScriptBadge[] = "Invalid value for 'script_badge'."; +const char kInvalidSearchEngineURL[] = + "Invalid URL [*] for 'chrome_settings_overrides.search_provider'."; const char kInvalidEmptySettingsOverrides[] = "Empty dictionary for 'chrome_settings_overrides'."; const char kInvalidShortName[] = diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h index 52bda7e..f2bdaf3 100644 --- a/extensions/common/manifest_constants.h +++ b/extensions/common/manifest_constants.h @@ -382,6 +382,7 @@ extern const char kInvalidSandboxedPagesList[]; extern const char kInvalidSandboxedPage[]; extern const char kInvalidSandboxedPagesCSP[]; extern const char kInvalidScriptBadge[]; +extern const char kInvalidSearchEngineURL[]; extern const char kInvalidEmptySettingsOverrides[]; extern const char kInvalidShortName[]; extern const char kInvalidSignature[]; |