diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-07-28 11:33:38 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-07-28 11:35:47 +0300 |
| commit | fc1ceeb02b3e149645205e67bcc009e742140590 (patch) | |
| tree | b559837b40485a7c0f77ce6459c03f131191283d /main/strongswan/1006-fix-printf-strlen.patch | |
| parent | c3aa1460dbeb4e1e10972fc00314d7a80413707e (diff) | |
| download | aports-fc1ceeb02b3e149645205e67bcc009e742140590.tar.bz2 aports-fc1ceeb02b3e149645205e67bcc009e742140590.tar.xz | |
main/strongswan: cherry-pick upstream fixes
also fixes a minor memory leak in patch 1001 (the offending hunk is
now just deleted, as other upstream commits fixed the issue it tried
to address)
Diffstat (limited to 'main/strongswan/1006-fix-printf-strlen.patch')
| -rw-r--r-- | main/strongswan/1006-fix-printf-strlen.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/main/strongswan/1006-fix-printf-strlen.patch b/main/strongswan/1006-fix-printf-strlen.patch deleted file mode 100644 index ad5948d24a..0000000000 --- a/main/strongswan/1006-fix-printf-strlen.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c b/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c -index 466c673..219c7bd 100644 ---- a/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c -+++ b/src/libstrongswan/utils/printf_hook/printf_hook_builtin.c -@@ -843,14 +843,14 @@ int builtin_vsnprintf(char *buffer, size_t n, const char *format, va_list ap) - /* String */ - sarg = va_arg(ap, const char *); - sarg = sarg ? sarg : "(null)"; -- slen = strlen(sarg); -+ slen = prec ? strnlen(sarg, prec) : strlen(sarg); - goto is_string; - } - case 'm': - { - /* glibc error string */ - sarg = strerror(errno); -- slen = strlen(sarg); -+ slen = prec ? strnlen(sarg, prec) : strlen(sarg); - goto is_string; - } - is_string: |