diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 16:23:34 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:37:21 +0000 |
commit | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch) | |
tree | c4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/services/data_decoder | |
parent | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff) | |
download | qtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz |
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/services/data_decoder')
15 files changed, 4 insertions, 99 deletions
diff --git a/chromium/services/data_decoder/BUILD.gn b/chromium/services/data_decoder/BUILD.gn index 0d814a52767..4c96e1c9593 100644 --- a/chromium/services/data_decoder/BUILD.gn +++ b/chromium/services/data_decoder/BUILD.gn @@ -84,6 +84,6 @@ fuzzer_test("xml_parser_fuzzer") { "//base", "//third_party/libxml:libxml", ] - dict = "//testing/libfuzzer/fuzzers/dicts/xml.dict" - seed_corpus = "xml_parser_fuzzer_corpus" + dict = "//third_party/libxml/fuzz/xml.dict" + seed_corpus = "//third_party/libxml/fuzz/seed_corpus" } diff --git a/chromium/services/data_decoder/image_decoder_impl_unittest.cc b/chromium/services/data_decoder/image_decoder_impl_unittest.cc index 5a43370a645..4d3fe8819f8 100644 --- a/chromium/services/data_decoder/image_decoder_impl_unittest.cc +++ b/chromium/services/data_decoder/image_decoder_impl_unittest.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" +#include "base/stl_util.h" #include "gin/array_buffer.h" #include "gin/public/isolate_holder.h" #include "services/data_decoder/image_decoder_impl.h" @@ -124,7 +125,7 @@ TEST_F(ImageDecoderImplTest, DecodeImageSizeLimit) { int heights[] = {max_height_for_msg - 10, max_height_for_msg + 10, 2 * max_height_for_msg + 10}; int widths[] = {heights[0] * 3 / 2, heights[1] * 3 / 2, heights[2] * 3 / 2}; - for (size_t i = 0; i < arraysize(heights); i++) { + for (size_t i = 0; i < base::size(heights); i++) { std::vector<unsigned char> jpg; ASSERT_TRUE(CreateJPEGImage(widths[i], heights[i], SK_ColorRED, &jpg)); diff --git a/chromium/services/data_decoder/public/cpp/json_sanitizer_android.cc b/chromium/services/data_decoder/public/cpp/json_sanitizer_android.cc index 23b3e6a6419..f9648759fed 100644 --- a/chromium/services/data_decoder/public/cpp/json_sanitizer_android.cc +++ b/chromium/services/data_decoder/public/cpp/json_sanitizer_android.cc @@ -88,7 +88,6 @@ void JsonSanitizerAndroid::OnError(const std::string& error) { } // namespace void JNI_JsonSanitizer_OnSuccess(JNIEnv* env, - const JavaParamRef<jclass>& clazz, jlong jsanitizer, const JavaParamRef<jstring>& json) { JsonSanitizerAndroid* sanitizer = @@ -97,7 +96,6 @@ void JNI_JsonSanitizer_OnSuccess(JNIEnv* env, } void JNI_JsonSanitizer_OnError(JNIEnv* env, - const JavaParamRef<jclass>& clazz, jlong jsanitizer, const JavaParamRef<jstring>& error) { JsonSanitizerAndroid* sanitizer = diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input0 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input0 deleted file mode 100644 index f10ac7c41ae..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input0 +++ /dev/null @@ -1 +0,0 @@ -<hello>bonjour</hello>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input1 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input1 deleted file mode 100644 index 3e105bacb2b..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input1 +++ /dev/null @@ -1,53 +0,0 @@ -<a> -<b> -<c> -<d> -<e> -<f> -<g> -<h> -<i> -<j> -<k> -<l> -<m> -<n> -<o> -<p> -<q> -<r> -<s> -<t> -<u> -<v> -<w> -<x> -<y> -<z> -Alphabet -</z> -</y> -</x> -</w> -</v> -</u> -</t> -</s> -</r> -</q> -</p> -</o> -</n> -</m> -</l> -</k> -</j> -</i> -</h> -</g> -</f> -</e> -</d> -</c> -</b> -</a>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input10 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input10 deleted file mode 100644 index 8db5766e810..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input10 +++ /dev/null @@ -1,2 +0,0 @@ -<!-- This is a comment. --> -<html>Some HTML</html> diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input11 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input11 deleted file mode 100644 index d4837caa6d8..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input11 +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - Some fine HTML -</html>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input2 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input2 deleted file mode 100644 index 487657daad9..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input2 +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- This is an XML sample --> -<library xmlns='http://library' xmlns:foo='http://foo.com'> - <book foo:id="k123"> - <author>Isaac Newton</author> - <title>Philosophiae Naturalis Principia Mathematica</title> - <genre>Science</genre> - <price>40.95</price> - <publish_date>1947-9-03</publish_date> - </book> - <book foo:id="k456"> - <author>Dr. Seuss</author> - <title>Green Eggs and Ham</title> - <genre>Kid</genre> - <foo:kids/> - <price>4.95</price> - <publish_date>1960-8-12</publish_date> - </book> -</library>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input3 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input3 deleted file mode 100644 index 82c1adaf9da..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input3 +++ /dev/null @@ -1 +0,0 @@ -<test>{"tag": "woop", "boing": 123, 12: ""foodyums"}</test>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input4 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input4 deleted file mode 100644 index d7d3dbc3735..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input4 +++ /dev/null @@ -1 +0,0 @@ -<number>18446744073709551616</number> diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input5 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input5 deleted file mode 100644 index 3941055f641..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input5 +++ /dev/null @@ -1 +0,0 @@ -<a><b>b1</b><c>c1</c><b>b2</b><c>c2</c><b>b3</b><c>c3</c></a>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input6 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input6 deleted file mode 100644 index 6b18aedda2d..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input6 +++ /dev/null @@ -1,5 +0,0 @@ -<hello> -<fr>coucou</fr> -<fr><proper>bonjour</proper><slang>salut</slang></fr> - <fr>ca va</fr> -</hello> diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input7 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input7 deleted file mode 100644 index f69e7e736f2..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input7 +++ /dev/null @@ -1 +0,0 @@ -<a><b></b><b></b></a>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input8 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input8 deleted file mode 100644 index a7556628661..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input8 +++ /dev/null @@ -1 +0,0 @@ -<translate lang='fr' id='123'><hello>bonjour</hello></translate>
\ No newline at end of file diff --git a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input9 b/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input9 deleted file mode 100644 index 8d16d1a76b3..00000000000 --- a/chromium/services/data_decoder/xml_parser_fuzzer_corpus/input9 +++ /dev/null @@ -1,3 +0,0 @@ -<?xml-stylesheet href="mystyle.css" type="text/css"?> -<html>Some HTML</html> - |