[PATCH v2] zip: Add patch fixing zipnote segfault

[PATCH v2] zip: Add patch fixing zipnote segfault

[Jate Sujjavanich]

[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]

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

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"

-- 
2.7.4

[-- Attachment #2: Type: text/html, Size: 2320 bytes --]

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

[Patchwork]

== Series Details ==

Series: zip: Add patch fixing zipnote segfault (rev2)
Revision: 2
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             Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] 
  Suggested fix    Create the series again using git-format-patch and ensure it can be applied using git am
  Diff line        comments */


* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 5115d2616b)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) 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