poppler/Stream.cc | 5 ++--- qt5/src/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 939465c40902d72e0c05d4f3a27ee67e4a007ed7 Author: Albert Astals Cid <[email protected]> Date: Tue Sep 19 21:19:03 2017 +0200 Fix crash in broken files Bug #102854 diff --git a/poppler/Stream.cc b/poppler/Stream.cc index f4eda85b..0ad602c7 100644 --- a/poppler/Stream.cc +++ b/poppler/Stream.cc @@ -454,11 +454,10 @@ ImageStream::ImageStream(Stream *strA, int widthA, int nCompsA, int nBitsA) { } else { imgLineSize = nVals; } - if (width > INT_MAX / nComps) { - // force a call to gmallocn(-1,...), which will throw an exception + if (nComps <= 0 || width > INT_MAX / nComps) { imgLineSize = -1; } - imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar)); + imgLine = (Guchar *)gmallocn_checkoverflow(imgLineSize, sizeof(Guchar)); } imgIdx = nVals; } commit a8aa61f774503c9ebd840e148c4fa31a6959600d Author: Albert Astals Cid <[email protected]> Date: Tue Sep 19 21:17:49 2017 +0200 autotools: Fix build diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am index b49dbca1..f0fae5b0 100644 --- a/qt5/src/Makefile.am +++ b/qt5/src/Makefile.am @@ -52,7 +52,8 @@ libpoppler_qt5_la_CPPFLAGS = \ -I$(top_srcdir)/poppler \ $(POPPLER_QT5_CFLAGS) \ $(NSS3_CFLAGS) \ - $(LCMS_CFLAGS) + $(LCMS_CFLAGS) \ + $(FREETYPE_CFLAGS) libpoppler_qt5_la_CXXFLAGS = \ -Dpoppler_qt5_EXPORTS _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
