updated to version 0.32.2

This commit is contained in:
Martin Gieseking 2017-11-02 10:13:02 +01:00
parent 1659f1c491
commit 0150b92364
4 changed files with 24 additions and 2 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ icoutils-0.29.1.tar.bz2
/icoutils-0.31.2.tar.bz2
/icoutils-0.31.3.tar.bz2
/icoutils-0.32.0.tar.bz2
/icoutils-0.32.2.tar.bz2

13
icoutils-nullptr.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/wrestool/extract.c b/wrestool/extract.c
index 0044ce0..84239d7 100644
--- a/wrestool/extract.c
+++ b/wrestool/extract.c
@@ -275,6 +275,8 @@ extract_bitmap_resource(WinLibrary *fi, WinResource *wr, size_t *ressize)
size_t size;
resentry=(uint8_t *)(get_resource_entry(fi,wr,&size));
+ if (!resentry)
+ return NULL;
/* Bitmap file consists of:
* 1) File header (14 bytes)

View File

@ -1,5 +1,5 @@
Name: icoutils
Version: 0.32.0
Version: 0.32.2
Release: 1%{?dist}
Summary: Utility for extracting and converting Microsoft icon and cursor files
@ -7,6 +7,9 @@ License: GPLv3+
URL: http://www.nongnu.org/icoutils/
Source0: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
# fixes segfault in wrestool (https://savannah.nongnu.org/bugs/?52319)
Patch0: %{name}-nullptr.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext
@ -23,6 +26,7 @@ libraries.
%prep
%setup -q
%patch0 -p1
autoreconf -i
@ -52,6 +56,10 @@ make install DESTDIR=%{buildroot}
%changelog
* Wed Nov 01 2017 Martin Gieseking <martin.gieseking@uos.de> - 0.32.2-1
- Updated to version 0.32.2.
- Added patch to fix https://savannah.nongnu.org/bugs/?52319
* Sat Sep 02 2017 Martin Gieseking <martin.gieseking@uos.de> - 0.32.0-1
- Updated to version 0.32.0.

View File

@ -1 +1 @@
SHA512 (icoutils-0.32.0.tar.bz2) = 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878
SHA512 (icoutils-0.32.2.tar.bz2) = 9d1ec7f8de2de35ca502ece953d288dad44143af185706855e8911c5e579153ce515208891783981c04406afc66db1e2a3f246515e888a2b1ccc6aea4b1056b8