From: Bernd Edlinger Date: Sun, 3 Nov 2019 16:34:23 +0000 (+0100) Subject: Fix a -Warray-bounds gcc warning in OPENSSL_DIR_read X-Git-Tag: openssl-3.0.0-alpha1~990 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=db5cf86535b305378308c58c52596994e1ece1e6;p=oweals%2Fopenssl.git 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) --- diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c index f2c8619115..ddf68b576f 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);