diff options
| author |   Jate Sujjavanich <jatedev@gmail.com> | 2020-01-06 22:36:10 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-10 21:11:25 +0000 |
| commit | 8e662fced80c98c5495d49c905cc0008cb812589 (patch) | |
| tree | 194212aca39d7ea5ca14e6b2751e3dfa6c44297d | |
| parent | f715c3cd1342a19a9cb780d02dfa425721b456be (diff) | |
| download | openembedded-core-8e662fced80c98c5495d49c905cc0008cb812589.tar.gz | |
zip: Add patch fixing zipnote segfault
This patch has been applied in several Linux distributions
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-extended/zip/zip_3.0.bb | 1 |
2 files changed, 23 insertions, 0 deletions
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 0000000000..ce6caff83e --- /dev/null +++ b/meta/recipes-extended/zip/zip-3.0/zipnote-crashes-with-segfault.patch @@ -0,0 +1,22 @@ +Close the correct file descriptor + +https://bugs.archlinux.org/task/47713 + +Signed-off-by: Jate Sujjavanich <jatedev@gmail.com> + +Upstream-Status: Inappropriate [no 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 */ + diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb index a2cd7717ca..c00a932763 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" |