From eb67b2616c737fba2cb1207f70d3ecd003844705 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Sun, 3 Nov 2019 17:34:23 +0100 Subject: [PATCH] Fix a -Warray-bounds gcc warning in OPENSSL_DIR_read '__builtin_strncpy' offset [275, 4095] from the object at 'direntry' is out of the bounds of referenced subobject 'd_name' with type 'char[256]' at offset 19 Reviewed-by: Kurt Roeckx Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10343) (cherry picked from commit db5cf86535b305378308c58c52596994e1ece1e6) --- crypto/LPdir_unix.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c index b1022895c8..bbbec0aee1 100644 --- a/crypto/LPdir_unix.c +++ b/crypto/LPdir_unix.c @@ -131,9 +131,8 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) return 0; } - strncpy((*ctx)->entry_name, direntry->d_name, - sizeof((*ctx)->entry_name) - 1); - (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0'; + OPENSSL_strlcpy((*ctx)->entry_name, direntry->d_name, + sizeof((*ctx)->entry_name)); #ifdef __VMS if ((*ctx)->expect_file_generations) { char *p = (*ctx)->entry_name + strlen((*ctx)->entry_name); -- 2.25.1