diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch')
-rw-r--r-- | poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch b/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch deleted file mode 100644 index ec8b303c43..0000000000 --- a/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-segfault-with-append.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 32d95fe0c90c59352a0ce3102fc9866cbfb0f629 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <gray@gnu.org> -Date: Sat, 1 Dec 2018 11:40:02 +0200 -Subject: [PATCH] Fix sigfault when appending to archive - -Bug reported by Ross Burton. See -<http://lists.gnu.org/archive/html/bug-cpio/2018-11/msg00000.html> - -* src/util.c: Keep static copy of the buffer pointer; always -assign it to file_hdr->c_name. Use x2realloc for memory management. ---- - src/util.c | 17 ++++------------- - 1 file changed, 4 insertions(+), 13 deletions(-) - -diff --git a/src/util.c b/src/util.c -index 10486dc..4e49124 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -1413,22 +1413,13 @@ set_file_times (int fd, - void - cpio_set_c_name (struct cpio_file_stat *file_hdr, char *name) - { -+ static char *buf = NULL; - static size_t buflen = 0; - size_t len = strlen (name) + 1; - -- if (buflen == 0) -- { -- buflen = len; -- if (buflen < 32) -- buflen = 32; -- file_hdr->c_name = xmalloc (buflen); -- } -- else if (buflen < len) -- { -- buflen = len; -- file_hdr->c_name = xrealloc (file_hdr->c_name, buflen); -- } -- -+ while (buflen < len) -+ buf = x2realloc (buf, &buflen); -+ file_hdr->c_name = buf; - file_hdr->c_namesize = len; - memmove (file_hdr->c_name, name, len); - } --- -2.18.0 - |