diff options
| author | bauerb <bauerb@chromium.org> | 2015-07-13 04:05:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-13 11:06:17 +0000 |
| commit | b1704d0c90a6eb1e4d5eb1e83976e5964ee378b7 (patch) | |
| tree | 3fc9c84049911645710aa2a9bb5f06e38ed84b5d /chrome/chrome.gyp | |
| parent | f8633deb9da835a863a5f77bdc1c52ee701d8ae2 (diff) | |
| download | chromium_src-b1704d0c90a6eb1e4d5eb1e83976e5964ee378b7.zip chromium_src-b1704d0c90a6eb1e4d5eb1e83976e5964ee378b7.tar.gz chromium_src-b1704d0c90a6eb1e4d5eb1e83976e5964ee378b7.tar.bz2 | |
Add a JSON sanitizer.
On Android, the JSON sanitizer parses the untrusted JSON in Java and checks it for wellformedness before serializing it again. On desktop platforms it uses SafeJsonParser to parse the JSON out of process, then serializes it again.
Also, on Android (where JsonSanitizer is not implemented in terms of the SafeJsonParser) the SafeJsonParser now uses the JsonSanitizer to sanitize its input before parsing it directly in process, instead of starting a new process, which is very costly on Android.
BUG=501333
Review URL: https://codereview.chromium.org/1203083002
Cr-Commit-Position: refs/heads/master@{#338495}
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 6d10f0d..f0bcc0a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -598,9 +598,10 @@ '../components/components.gyp:gcm_driver_java', '../components/components.gyp:invalidation_java', '../components/components.gyp:navigation_interception_java', - '../components/components.gyp:service_tab_launcher_java', '../components/components.gyp:policy_java', '../components/components.gyp:precache_java', + '../components/components.gyp:safe_json_java', + '../components/components.gyp:service_tab_launcher_java', '../components/components.gyp:variations_java', '../components/components.gyp:web_contents_delegate_android_java', '../content/content.gyp:content_java', |