external/pdfium/ubsan.patch |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 949775490a66cab7f55a32b21a09169857c2f306
Author: Stephan Bergmann <[email protected]>
Date:   Mon Apr 10 12:24:56 2017 +0200

    Avoid -fsanitize=null
    
    ...during CppunitTest_vcl_pdfexport:
    
    > workdir/UnpackedTarball/pdfium/core/fxge/ge/cfx_facecache.cpp:208:18: 
runtime error: null pointer passed as argument 1, which is declared to never be 
null
    > /usr/include/string.h:62:62: note: nonnull attribute specified here
    >     #0 0x2ba8c1d8c685 in CFX_FaceCache::RenderGlyph(CFX_Font const*, 
unsigned int, bool, CFX_Matrix const*, int, int) 
workdir/UnpackedTarball/pdfium/core/fxge/ge/cfx_facecache.cpp:208:5
    >     #1 0x2ba8c1d92007 in CFX_FaceCache::LookUpGlyphBitmap(CFX_Font 
const*, CFX_Matrix const*, CFX_ByteString const&, unsigned int, bool, int, int) 
workdir/UnpackedTarball/pdfium/core/fxge/ge/cfx_facecache.cpp:390:35
    >     #2 0x2ba8c1d90f44 in CFX_FaceCache::LoadGlyphBitmap(CFX_Font const*, 
unsigned int, bool, CFX_Matrix const*, int, int, int&) 
workdir/UnpackedTarball/pdfium/core/fxge/ge/cfx_facecache.cpp:307:10
    >     #3 0x2ba8c1dfd35e in CFX_Font::LoadGlyphBitmap(unsigned int, bool, 
CFX_Matrix const*, int, int, int&) const 
workdir/UnpackedTarball/pdfium/core/fxge/ge/cfx_font.cpp:688:26
    >     #4 0x2ba8c1ef56f0 in CFX_RenderDevice::DrawNormalText(int, 
FXTEXT_CHARPOS const*, CFX_Font*, float, CFX_Matrix const*, unsigned int, 
unsigned int) 
workdir/UnpackedTarball/pdfium/core/fxge/ge/cfx_renderdevice.cpp:946:31
    >     #5 0x2ba8c13c4e05 in 
CPDF_TextRenderer::DrawNormalText(CFX_RenderDevice*, 
std::__debug::vector<unsigned int, std::allocator<unsigned int> > const&, 
std::__debug::vector<float, std::allocator<float> > const&, CPDF_Font*, float, 
CFX_Matrix const*, unsigned int, CPDF_RenderOptions const*) 
workdir/UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_textrenderer.cpp:167:17
    >     #6 0x2ba8c13141f3 in CPDF_RenderStatus::ProcessText(CPDF_TextObject*, 
CFX_Matrix const*, CFX_PathData*) 
workdir/UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp:1777:10
    >     #7 0x2ba8c130bf5b in 
CPDF_RenderStatus::ProcessObjectNoClip(CPDF_PageObject*, CFX_Matrix const*) 
workdir/UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp:1141:14
    >     #8 0x2ba8c130db5a in 
CPDF_RenderStatus::ContinueSingleObject(CPDF_PageObject*, CFX_Matrix const*, 
IFX_Pause*) 
workdir/UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_renderstatus.cpp:1106:3
    >     #9 0x2ba8c12df4f2 in CPDF_ProgressiveRenderer::Continue(IFX_Pause*) 
workdir/UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_progressiverenderer.cpp:78:30
    >     #10 0x2ba8c12dbae9 in CPDF_ProgressiveRenderer::Start(IFX_Pause*) 
workdir/UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_progressiverenderer.cpp:39:3
    >     #11 0x2ba8c0652b76 in (anonymous 
namespace)::RenderPageImpl(CPDF_PageRenderContext*, CPDF_Page*, CFX_Matrix 
const&, FX_RECT const&, int, bool, IFSDK_PAUSE_Adapter*) 
workdir/UnpackedTarball/pdfium/fpdfsdk/fpdfview.cpp:115:26
    >     #12 0x2ba8c064d8cd in FPDF_RenderPage_Retail(CPDF_PageRenderContext*, 
void*, int, int, int, int, int, int, bool, IFSDK_PAUSE_Adapter*) 
workdir/UnpackedTarball/pdfium/fpdfsdk/fpdfview.cpp:986:3
    >     #13 0x2ba8c064d01d in FPDF_RenderPageBitmap 
workdir/UnpackedTarball/pdfium/fpdfsdk/fpdfview.cpp:728:3
    >     #14 0x2ba8b2adf081 in (anonymous 
namespace)::generatePreview(SvStream&, Graphic&) 
vcl/source/filter/ipdf/pdfread.cxx:67:5
    >     #15 0x2ba8b2adddf0 in vcl::ImportPDF(SvStream&, Graphic&) 
vcl/source/filter/ipdf/pdfread.cxx:109:10
    >     #16 0x2ba8b298f234 in GraphicFilter::ImportGraphic(Graphic&, 
rtl::OUString const&, SvStream&, unsigned short, unsigned short*, 
GraphicFilterImportFlags, 
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>*, 
WMF_EXTERNALHEADER*) vcl/source/filter/graphicfilter.cxx:1689:18
    >     #17 0x2ba8b29846e8 in GraphicFilter::ImportGraphic(Graphic&, 
rtl::OUString const&, SvStream&, unsigned short, unsigned short*, 
GraphicFilterImportFlags, WMF_EXTERNALHEADER*) 
vcl/source/filter/graphicfilter.cxx:1315:12
    >     #18 0x2ba904b12799 in SwGrfNode::ImportGraphic(SvStream&) 
sw/source/core/graphic/ndgrf.cxx:458:43
    >     #19 0x2ba904b0ea43 in SwGrfNode::SwapIn(bool) 
sw/source/core/graphic/ndgrf.cxx:571:28
    >     #20 0x2ba904b0fd52 in SwGrfNode::GetGrfObj(bool) const 
sw/source/core/graphic/ndgrf.cxx:389:35
    >     #21 0x2ba9037c40f9 in SwNoTextFrame::PaintPicture(OutputDevice*, 
SwRect const&) const sw/source/core/doc/notxtfrm.cxx:883:48
    >     #22 0x2ba9037bcec2 in SwNoTextFrame::Paint(OutputDevice&, SwRect 
const&, SwPrintData const*) const sw/source/core/doc/notxtfrm.cxx:309:9
    >     #23 0x2ba9052dc0d3 in SwLayoutFrame::Paint(OutputDevice&, SwRect 
const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3652:21
    >     #24 0x2ba9052fdfe8 in SwFlyFrame::Paint(OutputDevice&, SwRect const&, 
SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:4334:20
    >     #25 0x2ba9041e2bca in 
SwVirtFlyDrawObj::wrap_DoPaintObject(drawinglayer::geometry::ViewInformation2D 
const&) const sw/source/core/draw/dflyobj.cxx:466:30
    >     #26 0x2ba9041e1964 in 
drawinglayer::primitive2d::SwVirtFlyDrawObjPrimitive::get2DDecomposition(drawinglayer::primitive2d::Primitive2DDecompositionVisitor&,
 drawinglayer::geometry::ViewInformation2D const&) const 
sw/source/core/draw/dflyobj.cxx:228:35
    >     #27 0x2ba8daf085dc in 
drawinglayer::processor2d::BaseProcessor2D::process(drawinglayer::primitive2d::BasePrimitive2D
 const&) drawinglayer/source/processor2d/baseprocessor2d.cxx:47:24
    >     #28 0x2ba8db030133 in 
drawinglayer::processor2d::VclPixelProcessor2D::processBasePrimitive2D(drawinglayer::primitive2d::BasePrimitive2D
 const&) drawinglayer/source/processor2d/vclpixelprocessor2d.cxx:1289:21
    >     #29 0x2ba8daf09165 in 
drawinglayer::processor2d::BaseProcessor2D::process(drawinglayer::primitive2d::Primitive2DContainer
 const&) drawinglayer/source/processor2d/baseprocessor2d.cxx:70:29
    >     #30 0x2ba9361f56e0 in 
sdr::contact::ObjectContactOfPageView::DoProcessDisplay(sdr::contact::DisplayInfo&)
 svx/source/sdr/contact/objectcontactofpageview.cxx:325:35
    >     #31 0x2ba9361f08eb in 
sdr::contact::ObjectContactOfPageView::ProcessDisplay(sdr::contact::DisplayInfo&)
 svx/source/sdr/contact/objectcontactofpageview.cxx:124:21
    >     #32 0x2ba936512f89 in SdrPageWindow::RedrawLayer(unsigned char 
const*, sdr::contact::ViewObjectContactRedirector*, basegfx::B2IRange const*) 
svx/source/svdraw/sdrpagewindow.cxx:402:28
    >     #33 0x2ba93769c0f5 in SdrPageView::DrawLayer(unsigned char, 
OutputDevice*, sdr::contact::ViewObjectContactRedirector*, tools::Rectangle 
const&, basegfx::B2IRange const*) svx/source/svdraw/svdpagv.cxx:356:38
    >     #34 0x2ba907cceb8c in SwViewShellImp::PaintLayer(unsigned char, 
SwPrintData const*, SwPageFrame const&, SwRect const&, Color const*, bool, 
sdr::contact::ViewObjectContactRedirector*) sw/source/core/view/vdraw.cxx:146:24
    >     #35 0x2ba9052a5aef in SwRootFrame::Paint(OutputDevice&, SwRect 
const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3393:33
    >     #36 0x2ba907d08527 in SwViewShell::ImplEndAction(bool) 
sw/source/core/view/viewsh.cxx:410:49
    >     #37 0x2ba90223b161 in SwViewShell::EndAction(bool) 
sw/inc/viewsh.hxx:603:9
    >     #38 0x2ba907d16ff8 in SwViewShell::MakeVisible(SwRect const&) 
sw/source/core/view/viewsh.cxx:581:21
    >     #39 0x2ba902224187 in SwCursorShell::MakeSelVisible() 
sw/source/core/crsr/crsrsh.cxx:2818:13
    >     #40 0x2ba90494d45b in SwFEShell::MakeSelVisible() 
sw/source/core/frmedt/feshview.cxx:2531:24
    >     #41 0x2ba902187f27 in SwCursorShell::UpdateCursor(unsigned short, 
bool) sw/source/core/crsr/crsrsh.cxx:1842:13
    >     #42 0x2ba9021f9dfd in SwCursorShell::Pop(bool) 
sw/source/core/crsr/crsrsh.cxx:2081:13
    >     #43 0x2ba905a4afe3 in SwEnhancedPDFExportHelper::EnhancedPDFExport() 
sw/source/core/text/EnhancedPDFExportHelper.cxx:2173:25
    >     #44 0x2ba905a29f00 in 
SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper(SwEditShell&, 
OutputDevice&, rtl::OUString const&, bool, bool, SwPrintData const&) 
sw/source/core/text/EnhancedPDFExportHelper.cxx:1502:5
    >     #45 0x2ba90a741107 in SwXTextDocument::render(int, 
com::sun::star::uno::Any const&, 
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) 
sw/source/uibase/uno/unotxdoc.cxx:2986:51
    >     #46 0x2ba95ce0471b in PDFExport::ExportSelection(vcl::PDFWriter&, 
com::sun::star::uno::Reference<com::sun::star::view::XRenderable>&, 
com::sun::star::uno::Any const&, StringRangeEnumerator const&, 
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, int) 
filter/source/pdf/pdfexport.cxx:222:34
    >     #47 0x2ba95ce29474 in PDFExport::Export(rtl::OUString const&, 
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) 
filter/source/pdf/pdfexport.cxx:905:28
    >     #48 0x2ba95ce87d48 in 
PDFFilter::implExport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
 const&) filter/source/pdf/pdffilter.cxx:116:24
    >     #49 0x2ba95ce88e1e in 
PDFFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>
 const&) filter/source/pdf/pdffilter.cxx:177:23
    >     #50 0x2ba8e8c73429 in SfxObjectShell::ExportTo(SfxMedium&) 
sfx2/source/doc/objstor.cxx:2420:25
    >     #51 0x2ba8e8c5cc98 in SfxObjectShell::SaveTo_Impl(SfxMedium&, 
SfxItemSet const*) sfx2/source/doc/objstor.cxx:1533:19
    >     #52 0x2ba8e8c99cc5 in SfxObjectShell::PreDoSaveAs_Impl(rtl::OUString 
const&, rtl::OUString const&, SfxItemSet&) sfx2/source/doc/objstor.cxx:2813:39
    >     #53 0x2ba8e8c92eca in SfxObjectShell::CommonSaveAs_Impl(INetURLObject 
const&, rtl::OUString const&, SfxItemSet&) sfx2/source/doc/objstor.cxx:2685:9
    >     #54 0x2ba8e8bf2c82 in SfxObjectShell::APISaveAs_Impl(rtl::OUString 
const&, SfxItemSet&) sfx2/source/doc/objserv.cxx:305:19
    >     #55 0x2ba8e8e68eea in SfxBaseModel::impl_store(rtl::OUString const&, 
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, 
bool) sfx2/source/doc/sfxbasemodel.cxx:2990:46
    >     #56 0x2ba8e8e71d0b in SfxBaseModel::storeToURL(rtl::OUString const&, 
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) 
sfx2/source/doc/sfxbasemodel.cxx:1645:13
    >     #57 0x2ba8d3b43ea4 in (anonymous 
namespace)::PdfExportTest::load(rtl::OUString const&, 
vcl::filter::PDFDocument&) vcl/qa/cppunit/pdfexport/pdfexport.cxx:104:16
    >     #58 0x2ba8d3b30781 in (anonymous 
namespace)::PdfExportTest::testTdf107013() 
vcl/qa/cppunit/pdfexport/pdfexport.cxx:393:5
    >     #59 0x2ba8d3b417cb in CppUnit::TestCaller<(anonymous 
namespace)::PdfExportTest>::runTest() 
workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:166:6
    >     #60 0x2ba88f26cd8b in CppUnit::TestCaseMethodFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
    >     #61 0x2ba8a85afb0f in (anonymous 
namespace)::Protector::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) test/source/vclbootstrapprotector.cxx:39:14
    >     #62 0x2ba88f22b3ce in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
    >     #63 0x2ba89ee6214f in (anonymous 
namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext 
const&) unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx:89:12
    >     #64 0x2ba88f22b3ce in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
    >     #65 0x2ba89b0fc351 in (anonymous 
namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext 
const&) unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx:63:16
    >     #66 0x2ba88f22b3ce in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
    >     #67 0x2ba88f1a9350 in 
CppUnit::DefaultProtector::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12
    >     #68 0x2ba88f22b3ce in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
    >     #69 0x2ba88f227e70 in 
CppUnit::ProtectorChain::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:77:18
    >     #70 0x2ba88f2e70f5 in CppUnit::TestResult::protect(CppUnit::Functor 
const&, CppUnit::Test*, std::__cxx11::basic_string<char, 
std::char_traits<char>, std::allocator<char> > const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:181:28
    >     #71 0x2ba88f26afa4 in CppUnit::TestCase::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:13
    >     #72 0x2ba88f26f7a7 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
    >     #73 0x2ba88f26e819 in 
CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
    >     #74 0x2ba88f26f7a7 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
    >     #75 0x2ba88f26e819 in 
CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
    >     #76 0x2ba88f3255c9 in 
CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:27
    >     #77 0x2ba88f2e540d in CppUnit::TestResult::runTest(CppUnit::Test*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:148:9
    >     #78 0x2ba88f32689b in CppUnit::TestRunner::run(CppUnit::TestResult&, 
std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > 
const&) workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:96:14
    >     #79 0x532fb4 in (anonymous namespace)::ProtectedFixtureFunctor::run() 
const sal/cppunittester/cppunittester.cxx:306:20
    >     #80 0x52e7c3 in sal_main() sal/cppunittester/cppunittester.cxx:456:20
    >     #81 0x52cb6f in main sal/cppunittester/cppunittester.cxx:363:1
    >     #82 0x2ba890ed7400 in __libc_start_main (/lib64/libc.so.6+0x20400)
    >     #83 0x438019 in _start 
(workdir/LinkTarget/Executable/cppunittester+0x438019)
    
    Change-Id: Ia3e6983d07e2bb2d057beab1b42212d3cc8afe80

diff --git a/external/pdfium/ubsan.patch b/external/pdfium/ubsan.patch
index 08864b3a63b9..27ec578ca321 100644
--- a/external/pdfium/ubsan.patch
+++ b/external/pdfium/ubsan.patch
@@ -1,3 +1,15 @@
+--- core/fxge/ge/cfx_facecache.cpp
++++ core/fxge/ge/cfx_facecache.cpp
+@@ -205,7 +205,8 @@
+       }
+     }
+   } else {
+-    FXSYS_memset(pDestBuf, 0, dest_pitch * bmheight);
++    if (dest_pitch != 0 && bmheight != 0)
++        FXSYS_memset(pDestBuf, 0, dest_pitch * bmheight);
+     if (anti_alias == FXFT_RENDER_MODE_MONO &&
+         FXFT_Get_Bitmap_PixelMode(FXFT_Get_Glyph_Bitmap(m_Face)) ==
+             FXFT_PIXEL_MODE_MONO) {
 --- third_party/agg23/agg_rasterizer_scanline_aa.h
 +++ third_party/agg23/agg_rasterizer_scanline_aa.h
 @@ -349,14 +349,14 @@
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to