poppler/TextOutputDev.cc | 6 ++++-- poppler/poppler-config.h.cmake | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 15272137daf186114d8dfeb6898d8d90b3ccfd91 Author: Albert Astals Cid <[email protected]> Date: Wed Jan 3 00:14:13 2018 +0100 Fix undefined sanitizer warning about qsort Said the first parameter is defined by spec to not be null and we where passing null when there's no blocks, so add an if diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc index 9a77d050..b99797a0 100644 --- a/poppler/TextOutputDev.cc +++ b/poppler/TextOutputDev.cc @@ -20,7 +20,7 @@ // Copyright (C) 2006 Jeff Muizelaar <[email protected]> // Copyright (C) 2007, 2008, 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2008 Koji Otani <[email protected]> -// Copyright (C) 2008, 2010-2012, 2014-2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2008, 2010-2012, 2014-2018 Albert Astals Cid <[email protected]> // Copyright (C) 2008 Pino Toscano <[email protected]> // Copyright (C) 2008, 2010 Hib Eris <[email protected]> // Copyright (C) 2009 Ross Moore <[email protected]> @@ -3358,7 +3358,9 @@ void TextPage::coalesce(GBool physLayout, double fixedPitch, GBool doHTML) { for (blk = blkList, i = 0; blk; blk = blk->next, ++i) { blocks[i] = blk; } - qsort(blocks, nBlocks, sizeof(TextBlock *), &TextBlock::cmpXYPrimaryRot); + if (blocks) { + qsort(blocks, nBlocks, sizeof(TextBlock *), &TextBlock::cmpXYPrimaryRot); + } // column assignment for (i = 0; i < nBlocks; ++i) { commit 066e6a3e0487f9e011f7b8d1ccff62def8db1e6c Author: Albert Astals Cid <[email protected]> Date: Wed Jan 3 00:15:14 2018 +0100 Welcome 2018 diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 3a13e811..f6a6c27f 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -129,7 +129,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2017 The Poppler Developers - http://poppler.freedesktop.org"; +#define popplerCopyright "Copyright 2005-2018 The Poppler Developers - http://poppler.freedesktop.org"; #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
