Skip to contentSkip to conversation

zip: Add patch fixing zipnote segfault

PATCH Superseded Jate Sujjavanich 2 participants 2 messages Jan 7, 2020

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 zip: Add patch fixing zipnote segfault

This patch has been applied in several Linux distributions

---
 .../zipnote-crashes-with-segfault.patch       | 22 +++++++++++++++++++
 meta/recipes-extended/zip/zip_3.0.bb          |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch
meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch new file +22 -0
new file mode 100644
index 0000000000..e4d52c7dc6
@@ -0,0 +1,22 @@
+Close the correct file descriptor
+
+https://bugs.archlinux.org/task/47713
+
+Signed-off-by: Jate Sujjavanich <[email protected]>
+
+Upstream-Status: No Project Upstream
+
+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 */
+   
meta/recipes-extended/zip/zip_3.0.bb +1 -0
index a2cd7717ca..c00a932763 100644
@@ -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"
 
Signature · 1 line
2.17.2 (Apple Git-113)
#1 lore raw

✗ patchtest: failure for zip: Add patch fixing zipnote segfault (rev5)

== Series Details ==

Series: zip: Add patch fixing zipnote segfault (rev5)
Revision: 5
URL : https://patchwork.openembedded.org/series/21894/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Upstream-Status is in incorrect format [test_upstream_status_presence_format]

  Suggested fix    Fix Upstream-Status format in zipnote-crashes-with-segfault.patch
  Current          Upstream-Status: No Project Upstream
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe