From dca02dd9a09cc06dd60b88a86ad69f8bc95a441f Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Tue, 18 Feb 2020 22:30:12 +0100 Subject: [PATCH] fixed 323588 Uninitialized scalar variable accessing uninitialized data with mlock is undefined behavior --- src/libopensc/card-coolkey.c | 2 +- src/libopensc/sc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libopensc/card-coolkey.c b/src/libopensc/card-coolkey.c index ce22b3f2..0b37acf7 100644 --- a/src/libopensc/card-coolkey.c +++ b/src/libopensc/card-coolkey.c @@ -2062,7 +2062,7 @@ coolkey_process_combined_object(sc_card_t *card, coolkey_private_data_t *priv, u } memcpy(priv->token_name, &decompressed_header->token_name[0], decompressed_header->token_name_length); - priv->token_name[decompressed_header->token_name_length] = 0; + priv->token_name[decompressed_header->token_name_length] = '\0'; priv->token_name_length = decompressed_header->token_name_length; diff --git a/src/libopensc/sc.c b/src/libopensc/sc.c index 49bf5c97..85ab0b76 100644 --- a/src/libopensc/sc.c +++ b/src/libopensc/sc.c @@ -902,7 +902,7 @@ void *sc_mem_secure_alloc(size_t len) len = pages * page_size; } - p = malloc(len); + p = calloc(1, len); if (p == NULL) { return NULL; }