[v2] zip: Add patch fixing zipnote segfault

Submitted by Jate S on Jan. 6, 2020, 9:57 p.m. | Patch ID: 168632

Details

Message ID CAPphmgai-jo+UYEp1MyTre1_hNn3UCCS5EpTD9psxoSNPCmPzw@mail.gmail.com
State Superseded
Headers show

Commit Message

Jate S Jan. 6, 2020, 9:57 p.m.
This patch has been applied in several Linux distributions

Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
---
 .../zip/zip-3.0/zipnote-crashes-with-segfault.patch  | 20
++++++++++++++++++++
 meta/recipes-extended/zip/zip_3.0.bb                 |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644
meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch

Patch hide | download patch | download mbox

diff --git
a/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
new file mode 100644
index 0000000..aa10add
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
@@ -0,0 +1,20 @@ 
+Close the correct file descriptor
+
+https://bugs.archlinux.org/task/47713
+
+Upstream-Status: Pending
+
+diff --git a/zipnote.c b/zipnote.c
+index 5e02cb6..996f012 100644
+--- a/zipnote.c
++++ b/zipnote.c
+@@ -661,7 +661,7 @@ char **argv;            /* command line tokens */
+     if ((r = zipcopy(z)) != ZE_OK)
+       ziperr(r, "was copying an entry");
+   }
+-  fclose(x);
++  fclose(in_file);
+
+   /* Write central directory and end of central directory with new
comments */
+   if ((c = zftello(y)) == (zoff_t)-1)    /* get start of central */
+
diff --git a/meta/recipes-extended/zip/zip_3.0.bb
b/meta/recipes-extended/zip/zip_3.0.bb
index a2cd771..c00a932 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -12,6 +12,7 @@  S = "${WORKDIR}/zip30"
 SRC_URI =
"${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz \
            file://fix-security-format.patch \
            file://10-remove-build-date.patch \
+           file://zipnote-crashes-with-segfault.patch \
            "
 UPSTREAM_VERSION_UNKNOWN = "1"

Comments

Jate S Jan. 7, 2020, 9:05 a.m.
This is a system generated Comment: Patch 168632 was automatically marked as superseded by patch 168633.