Accepting request 782086 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/782086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zziplib?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2020-03-11 17:32:13 +00:00 committed by Git OBS Bridge
commit 9bb5640834
3 changed files with 13 additions and 6 deletions

View File

@ -2,12 +2,12 @@ Index: zziplib-0.13.69/bins/unzip-mem.c
===================================================================
--- zziplib-0.13.69.orig/bins/unzip-mem.c
+++ zziplib-0.13.69/bins/unzip-mem.c
@@ -93,7 +93,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
@@ -92,7 +92,7 @@ static void zzip_mem_entry_make(ZZIP_MEM
ZZIP_MEM_ENTRY* entry)
{
FILE* file = fopen (entry->zz_name, "wb");
if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
- perror (entry->zz_name);
+ else perror (entry->zz_name);
- if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
+ if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); return; }
perror (entry->zz_name);
if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 24 15:08:13 UTC 2020 - Josef Möllers <josef.moellers@suse.com>
- Corrected control flow in zzip_mem_entry_make() to
gain correct exit status.
[bsc#1154002, bsc1154002-prevent-unnecessary-perror.patch]
-------------------------------------------------------------------
Fri Dec 13 12:28:30 UTC 2019 - Josef Möllers <josef.moellers@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package zziplib
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed