The branch master has been updated
via d1c1fb2d41a627293483d832aaffcb6eca9075f9 (commit)
from 26b7cc0d20d180df28831931b5e75c14c015c5b9 (commit)
- Log -----------------------------------------------------------------
commit d1c1fb2d41a627293483d832aaffcb6eca9075f9
Author: raniervf <ranier_...@hotmail.com>
Date: Mon Nov 4 22:32:43 2019 -0300
conf_def.c: Avoid calling strlen() in a loop
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10361)
-----------------------------------------------------------------------
Summary of changes:
crypto/conf/conf_def.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index a8581d7320..91ae658f65 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -729,7 +729,9 @@ static BIO *process_include(char *include, OPENSSL_DIR_CTX
**dirctx,
static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx)
{
const char *filename;
+ size_t pathlen;
+ pathlen = strlen(path);
while ((filename = OPENSSL_DIR_read(dirctx, path)) != NULL) {
size_t namelen;
@@ -742,7 +744,7 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX
**dirctx)
char *newpath;
BIO *bio;
- newlen = strlen(path) + namelen + 2;
+ newlen = pathlen + namelen + 2;
newpath = OPENSSL_zalloc(newlen);
if (newpath == NULL) {
CONFerr(CONF_F_GET_NEXT_FILE, ERR_R_MALLOC_FAILURE);
@@ -753,14 +755,11 @@ static BIO *get_next_file(const char *path,
OPENSSL_DIR_CTX **dirctx)
* If the given path isn't clear VMS syntax,
* we treat it as on Unix.
*/
- {
- size_t pathlen = strlen(path);
-
- if (path[pathlen - 1] == ']' || path[pathlen - 1] == '>'
- || path[pathlen - 1] == ':') {
- /* Clear VMS directory syntax, just copy as is */
- OPENSSL_strlcpy(newpath, path, newlen);
- }
+ if (path[pathlen - 1] == ']'
+ || path[pathlen - 1] == '>'
+ || path[pathlen - 1] == ':') {
+ /* Clear VMS directory syntax, just copy as is */
+ OPENSSL_strlcpy(newpath, path, newlen);
}
#endif
if (newpath[0] == '\0') {
