[openssl] master update
bernd.edlinger at hotmail.de
bernd.edlinger at hotmail.de
Sat Nov 9 09:51:25 UTC 2019
The branch master has been updated
via db5cf86535b305378308c58c52596994e1ece1e6 (commit)
from d1c1fb2d41a627293483d832aaffcb6eca9075f9 (commit)
- Log -----------------------------------------------------------------
commit db5cf86535b305378308c58c52596994e1ece1e6
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date: Sun Nov 3 17:34:23 2019 +0100
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 <kurt at roeckx.be>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10343)
-----------------------------------------------------------------------
Summary of changes:
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 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);
More information about the openssl-commits
mailing list