1 files changed, 7 insertions, 2 deletions

diff --git a/src/lib/libc/stdlib/lsearch.c b/src/lib/libc/stdlib/lsearch.c
index 8cad05f510..93e200e1bd 100644
--- a/src/lib/libc/stdlib/lsearch.c
+++ b/src/lib/libc/stdlib/lsearch.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: lsearch.c,v 1.5 2014/07/18 04:16:09 matthew Exp $     */
+/*      $OpenBSD: lsearch.c,v 1.6 2021/12/07 04:01:45 cheloha Exp $     */
 
 /*
  * Copyright (c) 1989, 1993
@@ -79,6 +79,11 @@ linear_base(const void *key, const void *base, size_t *nelp, size_t width,
          * manual.
          */
         ++*nelp;
-        memcpy((void *)end, key, width);
+
+        /*
+         * Use memmove(3) to ensure the key is copied cleanly into the
+         * array, even if the key overlaps with the end of the array.
+         */
+        memmove((void *)end, key, width);
         return((void *)end);
 }