From 71fb0151f985924af60c383331b214a5a27790a5 Mon Sep 17 00:00:00 2001 From: Nathan Pratta Teodosio Date: Tue, 21 Jun 2022 08:47:14 -0300 Subject: Follow-up for Poppler 22.06 update Change-Id: I8ee9f1a53cc4389e6a4d44e9765b478b5edfffd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136342 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit ad1ffc62e40c2409b610dfff25a8483b1f2556ad) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136382 Reviewed-by: Adolfo Jayme Barrientos --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index d9efa39d8a54..f12478cb2f4d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -476,10 +476,10 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st // we must write byte count to stdout before #if POPPLER_CHECK_VERSION(22, 6, 0) std::optional> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); - nSize = pBuf->size(); - if ( nSize > 0 ) + if ( pBuf ) { aNewFont.isEmbedded = true; + nSize = pBuf->size(); } #else char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); @@ -503,7 +503,8 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const int nSize = 0; #if POPPLER_CHECK_VERSION(22, 6, 0) std::optional> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); - nSize = pBuf->size(); + if ( pBuf ) + nSize = pBuf->size(); if ( nSize == 0 ) return; #else -- cgit