|
 |
71e593 |
From cc285823b8966fc03a511c5aa7332a385d8c47c1 Mon Sep 17 00:00:00 2001
|
|
|
71e593 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
71e593 |
Date: Fri, 12 Oct 2018 09:32:11 +0200
|
|
|
71e593 |
Subject: [PATCH 53/57] p11: Fix two instances of -Wmaybe-uninitialized in
|
|
|
71e593 |
p11_child_openssl.c
|
|
|
71e593 |
|
|
|
71e593 |
If uri_str was passed to the p11_child and parsing the URI failed, then
|
|
|
71e593 |
modules would be uninitialized, but freed in the done handler with
|
|
|
71e593 |
p11_kit_modules_finalize_and_release()
|
|
|
71e593 |
|
|
|
71e593 |
Also, another warning is suppressed by setting the 's' variable to zero.
|
|
|
71e593 |
While it cannot happen that the variable will be uninitialized, we
|
|
|
71e593 |
should help the compiler by setting a value explicitly.
|
|
|
71e593 |
|
|
|
71e593 |
Reviewed-by: Sumit Bose <sbose@redhat.com>
|
|
|
71e593 |
(cherry picked from commit 7794caec36e7142423491d90aaade7e49b9df1c1)
|
|
|
71e593 |
---
|
|
|
71e593 |
src/p11_child/p11_child_openssl.c | 4 ++--
|
|
|
71e593 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
71e593 |
|
|
|
71e593 |
diff --git a/src/p11_child/p11_child_openssl.c b/src/p11_child/p11_child_openssl.c
|
|
|
71e593 |
index 9defdfc5a7acc70d0cea06d4919b06b93eb33c7b..adfe272e069bd0742caa1584153eb483e737e45b 100644
|
|
|
71e593 |
--- a/src/p11_child/p11_child_openssl.c
|
|
|
71e593 |
+++ b/src/p11_child/p11_child_openssl.c
|
|
|
71e593 |
@@ -1036,8 +1036,8 @@ errno_t do_card(TALLOC_CTX *mem_ctx, struct p11_ctx *p11_ctx,
|
|
|
71e593 |
{
|
|
|
71e593 |
int ret;
|
|
|
71e593 |
size_t c;
|
|
|
71e593 |
- size_t s;
|
|
|
71e593 |
- CK_FUNCTION_LIST **modules;
|
|
|
71e593 |
+ size_t s = 0;
|
|
|
71e593 |
+ CK_FUNCTION_LIST **modules = NULL;
|
|
|
71e593 |
CK_FUNCTION_LIST *module = NULL;
|
|
|
71e593 |
char *mod_name;
|
|
|
71e593 |
char *mod_file_name;
|
|
|
71e593 |
--
|
|
|
71e593 |
2.14.4
|
|
|
71e593 |
|