summaryrefslogtreecommitdiffstats
path: root/lib/libc/string/strlcpy.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2016-10-14 18:19:04 +0000
committerdtucker <dtucker@openbsd.org>2016-10-14 18:19:04 +0000
commitdf4c0a41c8137e422e53afe1770d6425e5ae42cb (patch)
tree0ddc5b12459ec9e06e0bed4bc717268c369d7193 /lib/libc/string/strlcpy.c
parentMissing flags in capture-pane, and tweak choose-tree text. From Dilyan Palauzov. (diff)
downloadwireguard-openbsd-df4c0a41c8137e422e53afe1770d6425e5ae42cb.tar.xz
wireguard-openbsd-df4c0a41c8137e422e53afe1770d6425e5ae42cb.zip
Cast pointers to uintptr_t to avoid potential signedness errors.
Based on patch from yuanjie.huang at windriver.com via OpenSSH bz#2608, with & ok millert, ok deraadt.
Diffstat (limited to 'lib/libc/string/strlcpy.c')
-rw-r--r--lib/libc/string/strlcpy.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 5fcf084aaad..f2828346801 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strlcpy.c,v 1.13 2015/08/31 02:53:57 guenther Exp $ */
+/* $OpenBSD: strlcpy.c,v 1.14 2016/10/14 18:19:04 dtucker Exp $ */
/*
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <string.h>
+#include <stdint.h>
/*
* Copy string src to buffer dst of size dsize. At most dsize-1
@@ -46,6 +47,11 @@ strlcpy(char *dst, const char *src, size_t dsize)
;
}
- return(src - osrc - 1); /* count does not include NUL */
+ /*
+ * Cast pointers to unsigned type before calculation, to avoid signed
+ * overflow when the string ends where the MSB has changed.
+ * Return value does not include NUL.
+ */
+ return((uintptr_t)src - (uintptr_t)osrc - 1);
}
DEF_WEAK(strlcpy);