summaryrefslogtreecommitdiff
path: root/xmalloc.c
diff options
context:
space:
mode:
authorcheloha@openbsd.org <cheloha@openbsd.org>2022-03-13 23:27:54 +0000
committerDamien Miller <djm@mindrot.org>2022-03-18 13:33:36 +1100
commitce324cf58ba2840e31afeb996935800780c8fa4b (patch)
tree9155ec03db843f696ba42c3eaf845de519a567ae /xmalloc.c
parent2893c5e764557f48f9d6a929e224ed49c59545db (diff)
downloadopenssh-git-ce324cf58ba2840e31afeb996935800780c8fa4b.tar.gz
upstream: ssh: xstrdup(): use memcpy(3)
Copying the given string into the buffer with strlcpy(3) confers no benefit in this context because we have already determined the string's length with strlen(3) in order to allocate that buffer. Thread: https://marc.info/?l=openbsd-tech&m=164687525802691&w=2 ok dtucker@ millert@ OpenBSD-Commit-ID: f8bfc082e36e2d2dc4e1feece02fe274155ca11a
Diffstat (limited to 'xmalloc.c')
-rw-r--r--xmalloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/xmalloc.c b/xmalloc.c
index b48d33bb..67191e3f 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.36 2019/11/12 22:32:48 djm Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.37 2022/03/13 23:27:54 cheloha Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -91,8 +91,7 @@ xstrdup(const char *str)
len = strlen(str) + 1;
cp = xmalloc(len);
- strlcpy(cp, str, len);
- return cp;
+ return memcpy(cp, str, len);
}
int