From 4bbc0bd925e32087de9c61bf2bee81d00ec1ad7f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 28 Jan 2017 20:28:00 +0000 Subject: [PATCH] dev-libs/libxls: fix infinite loop on excel files with 65535 rows Reported-by: globus Bug: https://bugs.gentoo.org/607094 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- .../libxls/files/libxls-1.4.0-infinite.patch | 16 ++++++++++++++++ ...ibxls-1.4.0.ebuild => libxls-1.4.0-r1.ebuild} | 1 + 2 files changed, 17 insertions(+) create mode 100644 dev-libs/libxls/files/libxls-1.4.0-infinite.patch rename dev-libs/libxls/{libxls-1.4.0.ebuild => libxls-1.4.0-r1.ebuild} (94%) diff --git a/dev-libs/libxls/files/libxls-1.4.0-infinite.patch b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch new file mode 100644 index 000000000000..6f6e9fc1e1ec --- /dev/null +++ b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch @@ -0,0 +1,16 @@ +cellRow and cellCol need to be of a type larger than WORD. +Otherwise for for documents with 65535 columns condition +loops forever in the following line: + for (cellRow = 0; cellRow <= pWS->rows.lastrow; cellRow++) { +In this case <= 65535 is always true. + +https://bugs.gentoo.org/607094 has an example doc of this kind. +diff --git a/libxls/src/xls2csv.c b/libxls/src/xls2csv.c +index b804267..1f0d4b3 100644 +--- a/src/xls2csv.c ++++ b/src/xls2csv.c +@@ -104,3 +104,3 @@ int main(int argc, char *argv[]) { + struct st_row_data* row; +- WORD cellRow, cellCol; ++ DWORD cellRow, cellCol; + diff --git a/dev-libs/libxls/libxls-1.4.0.ebuild b/dev-libs/libxls/libxls-1.4.0-r1.ebuild similarity index 94% rename from dev-libs/libxls/libxls-1.4.0.ebuild rename to dev-libs/libxls/libxls-1.4.0-r1.ebuild index 431c4003b7f0..bb23a6c7517e 100644 --- a/dev-libs/libxls/libxls-1.4.0.ebuild +++ b/dev-libs/libxls/libxls-1.4.0-r1.ebuild @@ -25,6 +25,7 @@ S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}"/${P}-asprintf.patch + "${FILESDIR}"/${P}-infinite.patch ) src_configure() { -- 2.26.2