update to version 0.32.3

This commit is contained in:
Martin Gieseking 2018-03-12 14:12:26 +01:00
parent 4757127dae
commit 0af5872673
4 changed files with 8 additions and 20 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ icoutils-0.29.1.tar.bz2
/icoutils-0.31.3.tar.bz2
/icoutils-0.32.0.tar.bz2
/icoutils-0.32.2.tar.bz2
/icoutils-0.32.3.tar.bz2

View File

@ -1,13 +0,0 @@
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,15 +1,12 @@
Name: icoutils
Version: 0.32.2
Release: 3%{?dist}
Version: 0.32.3
Release: 1%{?dist}
Summary: Utility for extracting and converting Microsoft icon and cursor files
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: gcc
@ -27,7 +24,6 @@ libraries.
%prep
%setup -q
%patch0 -p1
autoreconf -i
@ -57,6 +53,10 @@ make install DESTDIR=%{buildroot}
%changelog
* Mon Mar 12 2018 Martin Gieseking <martin.gieseking@uos.de> - 0.32.3-1
- Updated to version 0.32.3.
- Dropped patch to fix https://savannah.nongnu.org/bugs/?52319 (applied upstream)
* Mon Feb 19 2018 Martin Gieseking <martin.gieseking@uos.de> - 0.32.2-3
- Added BR: gcc according to new packaging guidelines

View File

@ -1 +1 @@
SHA512 (icoutils-0.32.2.tar.bz2) = 9d1ec7f8de2de35ca502ece953d288dad44143af185706855e8911c5e579153ce515208891783981c04406afc66db1e2a3f246515e888a2b1ccc6aea4b1056b8
SHA512 (icoutils-0.32.3.tar.bz2) = 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726