!6 add openEuler-Cleanup-residual-temporary-file.patch

From: @wcc_140409
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
This commit is contained in:
openeuler-ci-bot 2020-12-09 09:06:40 +08:00 committed by Gitee
commit 7b38818c9e
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,20 @@
diff -Naur a/zip.c b/zip.c
--- a/zip.c 2020-10-14 14:46:09.809000000 +0800
+++ b/zip.c 2020-10-15 14:17:17.884000000 +0800
@@ -450,6 +450,15 @@
/* Upon getting a user interrupt, turn echo back on for tty and abort
cleanly using ziperr(). */
{
+/* Cleanup residual temporary file */
+if ( s == SIGABRT )
+ {
+ if (tempzip != NULL)
+ {
+ destroy(tempzip);
+ }
+ }
+
#if defined(AMIGA) && defined(__SASC)
_abort();
#else

View File

@ -1,6 +1,6 @@
Name: zip Name: zip
Version: 3.0 Version: 3.0
Release: 25 Release: 26
Summary: A compression and file packaging/archive utility Summary: A compression and file packaging/archive utility
License: Info-ZIP License: Info-ZIP
URL: http://www.info-zip.org/Zip.html URL: http://www.info-zip.org/Zip.html
@ -16,6 +16,8 @@ Patch6: zipnote.patch
Patch6000: CVE-2018-13410.patch Patch6000: CVE-2018-13410.patch
Patch9000: openEuler-Cleanup-residual-temporary-file.patch
BuildRequires: bzip2-devel gcc BuildRequires: bzip2-devel gcc
Requires: unzip Requires: unzip
@ -54,6 +56,9 @@ mkdir -p %{buildroot}%{_mandir}/man1
%{_mandir}/man1/zip* %{_mandir}/man1/zip*
%changelog %changelog
* Dec Thu 8 2020 wuchaochao <wuchaochao4@huawei.com> - 3.0-26
- Add openEuler-Cleanup-residual-temporary-file.patch
* Fri Feb 14 2020 chengquan <chengquan3@huawei.com> - 3.0-25 * Fri Feb 14 2020 chengquan <chengquan3@huawei.com> - 3.0-25
- Add gcc BuildRequire - Add gcc BuildRequire