From 43c8a6adc0045c974fb1c831deeef53fa5a38a82 Mon Sep 17 00:00:00 2001 From: npm Date: Fri, 30 Sep 2016 08:37:51 -0700 Subject: Fix #includes in libfuzzer so pdfium can be rolled Note: pdfium bots don't seem to touch these files. Review-Url: https://codereview.chromium.org/2379973005 --- testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc | 8 ++++---- testing/libfuzzer/pdf_css_fuzzer.cc | 2 +- testing/libfuzzer/pdf_fm2js_fuzzer.cc | 4 ++-- testing/libfuzzer/pdf_hint_table_fuzzer.cc | 2 +- testing/libfuzzer/pdf_jpx_fuzzer.cc | 2 +- testing/libfuzzer/pdf_streamparser_fuzzer.cc | 5 ++--- testing/libfuzzer/pdf_xml_fuzzer.cc | 4 ++-- testing/libfuzzer/xfa_codec_fuzzer.h | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) (limited to 'testing/libfuzzer') diff --git a/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc b/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc index 4416c9e82c..58927c788a 100644 --- a/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc +++ b/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc @@ -4,12 +4,12 @@ #include -#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" -#include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" +#include "core/fpdfapi/fpdf_parser/cpdf_stream.h" +#include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" +#include "core/fxcodec/JBig2_DocumentContext.h" #include "core/fxcodec/codec/ccodec_jbig2module.h" -#include "core/fxcodec/include/JBig2_DocumentContext.h" #include "core/fxcodec/jbig2/JBig2_Context.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" static uint32_t GetInteger(const uint8_t* data) { return data[0] | data[1] << 8 | data[2] << 16 | data[3] << 24; diff --git a/testing/libfuzzer/pdf_css_fuzzer.cc b/testing/libfuzzer/pdf_css_fuzzer.cc index a893858aa4..ca3cf1a79d 100644 --- a/testing/libfuzzer/pdf_css_fuzzer.cc +++ b/testing/libfuzzer/pdf_css_fuzzer.cc @@ -4,7 +4,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fde/css/fde_css.h" #include "xfa/fde/css/fde_csssyntax.h" #include "xfa/fgas/crt/fgas_stream.h" diff --git a/testing/libfuzzer/pdf_fm2js_fuzzer.cc b/testing/libfuzzer/pdf_fm2js_fuzzer.cc index c1f2de0962..3e3bfae0d4 100644 --- a/testing/libfuzzer/pdf_fm2js_fuzzer.cc +++ b/testing/libfuzzer/pdf_fm2js_fuzzer.cc @@ -5,8 +5,8 @@ #include #include -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" #include "xfa/fxfa/fm2js/xfa_program.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { diff --git a/testing/libfuzzer/pdf_hint_table_fuzzer.cc b/testing/libfuzzer/pdf_hint_table_fuzzer.cc index d14d9464f5..d41a8a37a7 100644 --- a/testing/libfuzzer/pdf_hint_table_fuzzer.cc +++ b/testing/libfuzzer/pdf_hint_table_fuzzer.cc @@ -4,8 +4,8 @@ #include +#include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_hint_tables.h" -#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" struct DummyLinearizedDictionary { int end_of_first_page_offset; diff --git a/testing/libfuzzer/pdf_jpx_fuzzer.cc b/testing/libfuzzer/pdf_jpx_fuzzer.cc index 7af5d13fc1..bea7ba2dbe 100644 --- a/testing/libfuzzer/pdf_jpx_fuzzer.cc +++ b/testing/libfuzzer/pdf_jpx_fuzzer.cc @@ -7,7 +7,7 @@ #include #include "core/fxcodec/codec/codec_int.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" CCodec_JpxModule g_module; diff --git a/testing/libfuzzer/pdf_streamparser_fuzzer.cc b/testing/libfuzzer/pdf_streamparser_fuzzer.cc index 607c44b044..c0e68ba6bb 100644 --- a/testing/libfuzzer/pdf_streamparser_fuzzer.cc +++ b/testing/libfuzzer/pdf_streamparser_fuzzer.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fpdfapi/fpdf_page/pageint.h" - #include -#include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" +#include "core/fpdfapi/fpdf_page/pageint.h" +#include "core/fpdfapi/fpdf_parser/cpdf_object.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { CPDF_StreamParser parser(data, size); diff --git a/testing/libfuzzer/pdf_xml_fuzzer.cc b/testing/libfuzzer/pdf_xml_fuzzer.cc index c87199985e..199cba2996 100644 --- a/testing/libfuzzer/pdf_xml_fuzzer.cc +++ b/testing/libfuzzer/pdf_xml_fuzzer.cc @@ -7,8 +7,8 @@ #include #include -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_system.h" #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fxfa/parser/cxfa_xml_parser.h" #include "xfa/fxfa/parser/cxfa_widetextread.h" diff --git a/testing/libfuzzer/xfa_codec_fuzzer.h b/testing/libfuzzer/xfa_codec_fuzzer.h index e73405ef02..6a84ed8572 100644 --- a/testing/libfuzzer/xfa_codec_fuzzer.h +++ b/testing/libfuzzer/xfa_codec_fuzzer.h @@ -7,8 +7,8 @@ #include -#include "core/fxcodec/codec/include/ccodec_progressivedecoder.h" -#include "core/fxcodec/include/fx_codec.h" +#include "core/fxcodec/codec/ccodec_progressivedecoder.h" +#include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_stream.h" class XFACodecFuzzer { -- cgit v1.2.3