The branch master has been updated
via 6ffaf15d2363e782c6feeb8285a570986d03dd99 (commit)
from 297002a332302a102a9fd802012f12ba2ad056c1 (commit)
- Log -----------------------------------------------------------------
commit 6ffaf15d2363e782c6feeb8285a570986d03dd99
Author: Pauli <[email protected]>
Date: Fri Sep 15 07:52:32 2017 +1000
Remote unrequited casts
Also use strndup instead of a malloc/memcpy pair.
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4372)
-----------------------------------------------------------------------
Summary of changes:
crypto/x509/by_dir.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index e1a09cb..03492ac 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -170,8 +170,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int
type)
continue;
for (j = 0; j < sk_BY_DIR_ENTRY_num(ctx->dirs); j++) {
ent = sk_BY_DIR_ENTRY_value(ctx->dirs, j);
- if (strlen(ent->dir) == (size_t)len &&
- strncmp(ent->dir, ss, (unsigned int)len) == 0)
+ if (strlen(ent->dir) == len && strncmp(ent->dir, ss, len) == 0)
break;
}
if (j < sk_BY_DIR_ENTRY_num(ctx->dirs))
@@ -188,13 +187,11 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int
type)
return 0;
ent->dir_type = type;
ent->hashes = sk_BY_DIR_HASH_new(by_dir_hash_cmp);
- ent->dir = OPENSSL_malloc((unsigned int)len + 1);
+ ent->dir = OPENSSL_strndup(ss, len);
if (ent->dir == NULL || ent->hashes == NULL) {
by_dir_entry_free(ent);
return 0;
}
- strncpy(ent->dir, ss, (unsigned int)len);
- ent->dir[len] = '\0';
if (!sk_BY_DIR_ENTRY_push(ctx->dirs, ent)) {
by_dir_entry_free(ent);
return 0;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
