From cc285823b8966fc03a511c5aa7332a385d8c47c1 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Fri, 12 Oct 2018 09:32:11 +0200
Subject: [PATCH 53/57] p11: Fix two instances of -Wmaybe-uninitialized in
 p11_child_openssl.c

If uri_str was passed to the p11_child and parsing the URI failed, then
modules would be uninitialized, but freed in the done handler with
p11_kit_modules_finalize_and_release()

Also, another warning is suppressed by setting the 's' variable to zero.
While it cannot happen that the variable will be uninitialized, we
should help the compiler by setting a value explicitly.

Reviewed-by: Sumit Bose <sbose@redhat.com>
(cherry picked from commit 7794caec36e7142423491d90aaade7e49b9df1c1)
---
 src/p11_child/p11_child_openssl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p11_child/p11_child_openssl.c b/src/p11_child/p11_child_openssl.c
index 9defdfc5a7acc70d0cea06d4919b06b93eb33c7b..adfe272e069bd0742caa1584153eb483e737e45b 100644
--- a/src/p11_child/p11_child_openssl.c
+++ b/src/p11_child/p11_child_openssl.c
@@ -1036,8 +1036,8 @@ errno_t do_card(TALLOC_CTX *mem_ctx, struct p11_ctx *p11_ctx,
 {
     int ret;
     size_t c;
-    size_t s;
-    CK_FUNCTION_LIST **modules;
+    size_t s = 0;
+    CK_FUNCTION_LIST **modules = NULL;
     CK_FUNCTION_LIST *module = NULL;
     char *mod_name;
     char *mod_file_name;
-- 
2.14.4