diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-30 20:20:35 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-30 20:20:35 +0000 |
| commit | 8e020ea06c96baaef3f1cdfb36182a12ee6895d2 (patch) | |
| tree | 5730d2f43c6ac23a767914a614921f5172f7f319 /system/skalibs/env_dump-unterminated-strings.patch | |
| parent | 01e07c91e249e8f1bd88fe550de3d65c4f95c7dc (diff) | |
| parent | 4b99f2a6399966628192b2bfe2bd6846ae8b2623 (diff) | |
| download | packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.tar.gz packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.tar.bz2 packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.tar.xz packages-8e020ea06c96baaef3f1cdfb36182a12ee6895d2.zip | |
Merge branch 'skaware.20190925' into 'master'
system/skalibs: bump to 2.9.0.0 + related skaware bumps
See merge request adelie/packages!345
Diffstat (limited to 'system/skalibs/env_dump-unterminated-strings.patch')
| -rw-r--r-- | system/skalibs/env_dump-unterminated-strings.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/system/skalibs/env_dump-unterminated-strings.patch b/system/skalibs/env_dump-unterminated-strings.patch deleted file mode 100644 index a20a78125..000000000 --- a/system/skalibs/env_dump-unterminated-strings.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d69644de85148f56efeed4259a783881e2a1bddc Mon Sep 17 00:00:00 2001 -From: Laurent Bercot <ska-skaware@skarnet.org> -Date: Wed, 31 Jul 2019 23:47:35 +0000 -Subject: [PATCH] bugfix: env_dump() unterminated strings - ---- - src/libstddjb/env_dump.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libstddjb/env_dump.c b/src/libstddjb/env_dump.c -index fc79bc3..10f5913 100644 ---- a/src/libstddjb/env_dump.c -+++ b/src/libstddjb/env_dump.c -@@ -32,7 +32,8 @@ int env_dump (char const *dir, mode_t mode, char const *const *envp) - size_t len = str_chr(*envp, '=') ; - size_t vallen = strlen(*envp + len + 1) ; - char fn[len + 1] ; -- memcpy(fn, *envp, len + 1) ; -+ memcpy(fn, *envp, len) ; -+ fn[len] = 0 ; - len = openwritenclose_at(fd, fn, *envp + len + 1, vallen) ; - if (len < vallen) goto cerr ; - } --- -2.22.0 - |