← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/search-credit.patch

  • Committer: Chad MILLER
  • Date: 2015-04-17 00:17:26 UTC
  • Revision ID: chad.miller@canonical.com-20150417001726-dszj422xuq86ob42
* Upstream release 42.0.2311.90:
  - CVE-2015-1235: Cross-origin-bypass in HTML parser.
  - CVE-2015-1236: Cross-origin-bypass in Blink.
  - CVE-2015-1237: Use-after-free in IPC.
  - CVE-2015-1238: Out-of-bounds write in Skia.
  - CVE-2015-1240: Out-of-bounds read in WebGL.
  - CVE-2015-1241: Tap-Jacking.
  - CVE-2015-1242: Type confusion in V8.
  - CVE-2015-1244: HSTS bypass in WebSockets.
  - CVE-2015-1245: Use-after-free in PDFium.
  - CVE-2015-1247: Scheme issues in OpenSearch.
  - CVE-2015-1248: SafeBrowsing bypass.
* Upstream release 41.0.2272.118:
  - CVE-2015-1233: A special thanks to Anonymous for a combination of V8,
    Gamepad and IPC bugs that can lead to remote code execution outside of
    the sandbox. 
  - CVE-2015-1234: Buffer overflow via race condition in GPU.
* debian/chromium-browser-etc-customizations-flash-staleness: Ask sudo users
  to update flash player.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/search-credit.patch
14
14
     },
15
15
--- a/components/search_engines/template_url.cc
16
16
+++ b/components/search_engines/template_url.cc
17
 
@@ -834,6 +834,9 @@ std::string TemplateURLRef::HandleReplac
 
17
@@ -835,6 +835,9 @@ std::string TemplateURLRef::HandleReplac
18
18
 
19
19
   std::string url = parsed_url_;
20
20
 
24
24
   // replacements_ is ordered in ascending order, as such we need to iterate
25
25
   // from the back.
26
26
   for (Replacements::reverse_iterator i = replacements_.rbegin();
27
 
@@ -863,6 +866,7 @@ std::string TemplateURLRef::HandleReplac
 
27
@@ -864,6 +867,7 @@ std::string TemplateURLRef::HandleReplac
28
28
 
29
29
       case GOOGLE_BASE_URL:
30
30
         DCHECK(!i->is_post_param);
32
32
         HandleReplacement(
33
33
             std::string(), search_terms_data.GoogleBaseURLValue(), *i, &url);
34
34
         break;
35
 
@@ -1038,7 +1042,8 @@ std::string TemplateURLRef::HandleReplac
 
35
@@ -1039,7 +1043,8 @@ std::string TemplateURLRef::HandleReplac
36
36
 
37
37
       case GOOGLE_SEARCH_CLIENT: {
38
38
         DCHECK(!i->is_post_param);
42
42
         if (!client.empty())
43
43
           HandleReplacement("client", client, *i, &url);
44
44
         break;
45
 
@@ -1135,6 +1140,11 @@ std::string TemplateURLRef::HandleReplac
 
45
@@ -1137,6 +1142,11 @@ std::string TemplateURLRef::HandleReplac
46
46
     }
47
47
   }
48
48