From 6c6fb121cd36c4aaeacca295fde744617e3fa61e Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Wed, 19 Mar 2003 20:50:56 +0000 Subject: use strnlen to prevent coredumps (This used to be commit 5078436d83f0fdc568d6687809c7c70dea5fd382) --- source3/lib/util_str.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 5157de0d91..d1e57ed5cf 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -495,7 +495,7 @@ char *safe_strcpy_fn(const char *fn, int line, char *dest,const char *src, size_ return dest; } - len = strlen(src); + len = strnlen(src, maxlength+1); if (len > maxlength) { DEBUG(0,("ERROR: string overflow by %u (%u - %u) in safe_strcpy [%.50s]\n", @@ -524,8 +524,8 @@ char *safe_strcat_fn(const char *fn, int line, char *dest, const char *src, size if (!src) return dest; - src_len = strlen(src); - dest_len = strlen(dest); + src_len = strnlen(src, maxlength + 1); + dest_len = strnlen(dest, maxlength + 1); clobber_region(fn, line, dest + dest_len, maxlength + 1 - dest_len); -- cgit