Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libxls for openSUSE:Factory checked in at 2021-01-26 14:48:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxls (Old) and /work/SRC/openSUSE:Factory/.libxls.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxls" Tue Jan 26 14:48:01 2021 rev:4 rq:866814 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libxls/libxls.changes 2020-09-16 19:44:06.871104485 +0200 +++ /work/SRC/openSUSE:Factory/.libxls.new.28504/libxls.changes 2021-01-26 14:51:48.315845716 +0100 @@ -1,0 +2,6 @@ +Tue Jan 26 11:30:00 UTC 2021 - Jan Engelhardt <[email protected]> + +- Update to release 1.6.2 + * Fix NULL pointer dereferences in the xls2csv tool + +------------------------------------------------------------------- Old: ---- libxls-1.6.1.tar.gz New: ---- libxls-1.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxls.spec ++++++ --- /var/tmp/diff_new_pack.2az9F6/_old 2021-01-26 14:51:48.839846430 +0100 +++ /var/tmp/diff_new_pack.2az9F6/_new 2021-01-26 14:51:48.843846435 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxls # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libxls %define lname libxlsreader8 -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Library for Parsing Excel (XLS) Files License: BSD-2-Clause ++++++ libxls-1.6.1.tar.gz -> libxls-1.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/README.md new/libxls-1.6.2/README.md --- old/libxls-1.6.1/README.md 2020-06-20 13:44:00.000000000 +0200 +++ new/libxls-1.6.2/README.md 2020-12-21 20:20:51.000000000 +0100 @@ -1,4 +1,4 @@ -[](https://travis-ci.org/libxls/libxls) +[](https://github.com/libxls/libxls/actions) [](https://ci.appveyor.com/project/evanmiller/libxls-252ki) [](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:libxls) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/configure new/libxls-1.6.2/configure --- old/libxls-1.6.1/configure 2020-09-09 16:08:11.000000000 +0200 +++ new/libxls-1.6.2/configure 2021-01-04 05:30:08.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libxls 1.6.1. +# Generated by GNU Autoconf 2.69 for libxls 1.6.2. # -# Report bugs to <[email protected]>. +# Report bugs to <https://github.com/libxls/libxls/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -274,11 +274,11 @@ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell [email protected] and [email protected] -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." + $as_echo "$0: Please tell [email protected] and +$0: https://github.com/libxls/libxls/issues about your +$0: system, including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -590,9 +590,9 @@ # Identity of this package. PACKAGE_NAME='libxls' PACKAGE_TARNAME='libxls' -PACKAGE_VERSION='1.6.1' -PACKAGE_STRING='libxls 1.6.1' -PACKAGE_BUGREPORT='[email protected]' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='libxls 1.6.2' +PACKAGE_BUGREPORT='https://github.com/libxls/libxls/issues' PACKAGE_URL='https://github.com/libxls/libxls' ac_unique_file="test/test.c" @@ -1346,7 +1346,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxls 1.6.1 to adapt to many kinds of systems. +\`configure' configures libxls 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1416,7 +1416,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxls 1.6.1:";; + short | recursive ) echo "Configuration of libxls 1.6.2:";; esac cat <<\_ACEOF @@ -1475,7 +1475,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <[email protected]>. +Report bugs to <https://github.com/libxls/libxls/issues>. libxls home page: <https://github.com/libxls/libxls>. _ACEOF ac_status=$? @@ -1539,7 +1539,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxls configure 1.6.1 +libxls configure 1.6.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2005,9 +2005,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------------------- ## -## Report this to [email protected] ## -## --------------------------------- ##" +( $as_echo "## ------------------------------------------------------ ## +## Report this to https://github.com/libxls/libxls/issues ## +## ------------------------------------------------------ ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2083,7 +2083,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libxls $as_me 1.6.1, which was +It was created by libxls $as_me 1.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2435,7 +2435,7 @@ LIBXLS_MAJOR_VERSION=1 LIBXLS_MINOR_VERSION=6 -LIBXLS_MICRO_VERSION=1 +LIBXLS_MICRO_VERSION=2 VERSION=$LIBXLS_MAJOR_VERSION.$LIBXLS_MINOR_VERSION.$LIBXLS_MICRO_VERSION # if libxls ever goes to 2.0 you will need to change the following line to @@ -2981,7 +2981,7 @@ # Define the identity of the package. PACKAGE='libxls' - VERSION='1.6.1' + VERSION='1.6.2' cat >>confdefs.h <<_ACEOF @@ -19629,7 +19629,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxls $as_me 1.6.1, which was +This file was extended by libxls $as_me 1.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19689,14 +19689,14 @@ Configuration commands: $config_commands -Report bugs to <[email protected]>. +Report bugs to <https://github.com/libxls/libxls/issues>. libxls home page: <https://github.com/libxls/libxls>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libxls config.status 1.6.1 +libxls config.status 1.6.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/configure.ac new/libxls-1.6.2/configure.ac --- old/libxls-1.6.1/configure.ac 2020-09-09 15:59:32.000000000 +0200 +++ new/libxls-1.6.2/configure.ac 2021-01-04 05:28:43.000000000 +0100 @@ -1,9 +1,9 @@ -AC_INIT([libxls],[1.6.1],[[email protected]], [libxls], [https://github.com/libxls/libxls]) +AC_INIT([libxls],[1.6.2],[https://github.com/libxls/libxls/issues], [libxls], [https://github.com/libxls/libxls]) AC_CONFIG_SRCDIR([test/test.c]) LIBXLS_MAJOR_VERSION=1 LIBXLS_MINOR_VERSION=6 -LIBXLS_MICRO_VERSION=1 +LIBXLS_MICRO_VERSION=2 VERSION=$LIBXLS_MAJOR_VERSION.$LIBXLS_MINOR_VERSION.$LIBXLS_MICRO_VERSION # if libxls ever goes to 2.0 you will need to change the following line to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/src/ole.c new/libxls-1.6.2/src/ole.c --- old/libxls-1.6.1/src/ole.c 2020-09-04 17:25:39.000000000 +0200 +++ new/libxls-1.6.2/src/ole.c 2020-12-30 05:46:44.000000000 +0100 @@ -36,7 +36,6 @@ #include "config.h" #include <memory.h> -#include <math.h> #include <string.h> #include <stdio.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/src/xls.c new/libxls-1.6.2/src/xls.c --- old/libxls-1.6.1/src/xls.c 2020-09-04 17:25:39.000000000 +0200 +++ new/libxls-1.6.2/src/xls.c 2020-12-30 05:48:33.000000000 +0100 @@ -45,7 +45,6 @@ #endif #include <memory.h> -#include <math.h> #include <sys/types.h> #include <string.h> #include <wchar.h> @@ -67,7 +66,7 @@ static xls_error_t xls_addSST(xlsWorkBook* pWB, SST* sst, DWORD size); static xls_error_t xls_appendSST(xlsWorkBook* pWB, BYTE* buf, DWORD size); static xls_error_t xls_addFormat(xlsWorkBook* pWB, FORMAT* format, DWORD size); -static char* xls_addSheet(xlsWorkBook* pWB, BOUNDSHEET* bs, DWORD size); +static xls_error_t xls_addSheet(xlsWorkBook* pWB, BOUNDSHEET* bs, DWORD size); static xls_error_t xls_addRow(xlsWorkSheet* pWS,ROW* row); static xls_error_t xls_makeTable(xlsWorkSheet* pWS); static struct st_cell_data *xls_addCell(xlsWorkSheet* pWS, BOF* bof, BYTE* buf); @@ -345,7 +344,7 @@ return ret; } -static char * xls_addSheet(xlsWorkBook* pWB, BOUNDSHEET *bs, DWORD size) +static xls_error_t xls_addSheet(xlsWorkBook* pWB, BOUNDSHEET *bs, DWORD size) { char * name; DWORD filepos; @@ -392,7 +391,7 @@ pWB->sheets.sheet = realloc(pWB->sheets.sheet,(pWB->sheets.count+1)*sizeof (struct st_sheet_data)); if (pWB->sheets.sheet == NULL) - return NULL; + return LIBXLS_ERROR_MALLOC; pWB->sheets.sheet[pWB->sheets.count].name=name; pWB->sheets.sheet[pWB->sheets.count].filepos=filepos; @@ -400,7 +399,7 @@ pWB->sheets.sheet[pWB->sheets.count].type=type; pWB->sheets.count++; - return name; + return LIBXLS_OK; } @@ -935,9 +934,10 @@ //printf("ADD SHEET\n"); BOUNDSHEET *bs = (BOUNDSHEET *)buf; xlsConvertBoundsheet(bs); - //char *s; // different for BIFF5 and BIFF8 - /*s = */ xls_addSheet(pWB, bs, bof1.size); + if ((retval = xls_addSheet(pWB, bs, bof1.size)) != LIBXLS_OK) { + goto cleanup; + } } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/src/xls2csv.c new/libxls-1.6.2/src/xls2csv.c --- old/libxls-1.6.1/src/xls2csv.c 2019-02-10 18:19:57.000000000 +0100 +++ new/libxls-1.6.2/src/xls2csv.c 2020-12-30 15:32:03.000000000 +0100 @@ -89,16 +89,16 @@ justList = 1; break; case 'e': - encoding = strdup(optarg); + encoding = optarg; break; case 't': - sheetName = strdup(optarg); + sheetName = optarg; break; case 'q': stringSeparator = optarg[0]; break; case 'f': - fieldSeparator = strdup(optarg); + fieldSeparator = optarg; break; case 'v': xls(1); @@ -120,14 +120,17 @@ // check if the requested sheet (if any) exists if (sheetName[0]) { for (i = 0; i < pWB->sheets.count; i++) { - if (strcmp(sheetName, (char *)pWB->sheets.sheet[i].name) == 0) { - break; - } + if (!pWB->sheets.sheet[i].name) + continue; + if (strcmp(sheetName, (char *)pWB->sheets.sheet[i].name) == 0) { + break; + } } if (i == pWB->sheets.count) { fprintf(stderr, "Sheet \"%s\" not found", sheetName); fprintf(stderr, "\n"); + xls_close(pWB); return EXIT_FAILURE; } } @@ -138,15 +141,17 @@ // just looking for sheet names if (justList) { - printf("%s\n", pWB->sheets.sheet[i].name); + printf("%s\n", pWB->sheets.sheet[i].name ? pWB->sheets.sheet[i].name : ""); continue; } // check if this the sheet we want if (sheetName[0]) { - if (strcmp(sheetName, (char *)pWB->sheets.sheet[i].name) != 0) { - continue; - } + if (!pWB->sheets.sheet[i].name) + continue; + if (strcmp(sheetName, (char *)pWB->sheets.sheet[i].name) != 0) { + continue; + } } // open and parse the sheet @@ -195,7 +200,7 @@ if (cell->l == 0) // its a number { OutputNumber(cell->d); - } else { + } else if (cell->str) { if (!strcmp((char *)cell->str, "bool")) // its boolean, and test cell->d { OutputString((int) cell->d ? "true" : "false"); @@ -207,7 +212,7 @@ OutputString((char *)cell->str); } } - } else if (cell->str != NULL) { + } else if (cell->str) { OutputString((char *)cell->str); } else { OutputString(""); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libxls-1.6.1/src/xlstool.c new/libxls-1.6.2/src/xlstool.c --- old/libxls-1.6.1/src/xlstool.c 2020-09-04 17:25:39.000000000 +0200 +++ new/libxls-1.6.2/src/xlstool.c 2020-12-30 05:46:54.000000000 +0100 @@ -35,7 +35,6 @@ #include "config.h" -#include <math.h> #include <sys/types.h> #include <wchar.h> #include <stdio.h>
