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

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 (file)
index 0000000..6f6e9fc
--- /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 431c4003b7f046475eada8adbcaf92d052a27635..bb23a6c7517e9b2e7b0788f75b30ad5c7dae18d2 100644 (file)
--- 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() {