Module Name: src
Committed By: joerg
Date: Wed May 13 19:57:16 UTC 2015
Modified Files:
src/lib/libc/ssp: memcpy_chk.c
Log Message:
void * is bad for computation, so cast to const char * first.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/ssp/memcpy_chk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/ssp/memcpy_chk.c
diff -u src/lib/libc/ssp/memcpy_chk.c:1.6 src/lib/libc/ssp/memcpy_chk.c:1.7
--- src/lib/libc/ssp/memcpy_chk.c:1.6 Sat May 9 15:42:21 2015
+++ src/lib/libc/ssp/memcpy_chk.c Wed May 13 19:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $ */
+/* $NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: memcpy_chk.c,v 1.6 2015/05/09 15:42:21 christos Exp $");
+__RCSID("$NetBSD: memcpy_chk.c,v 1.7 2015/05/13 19:57:16 joerg Exp $");
/*LINTLIBRARY*/
@@ -47,7 +47,7 @@ __memcpy_chk(void * __restrict dst, cons
if (len > slen)
__chk_fail();
- if (__ssp_overlap(src, dst, len))
+ if (__ssp_overlap((const char *)src, (const char *)dst, len))
__chk_fail();
return memcpy(dst, src, len);
