From 8fc67658a6023170c0e1a14c50988eb6ed06f392 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Mon, 13 Sep 2021 23:32:09 +1000
Subject: [PATCH] various: squash MSVC uninitialized variable warnings (C4701)

Initialize some variables to silence some false positive MSVC warnings.
---
 lib/gssapi/test_context.c | 11 ++++++-----
 lib/hdb/test_namespace.c  | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/gssapi/test_context.c b/lib/gssapi/test_context.c
index d7b6090b8..4aaa69152 100644
--- a/lib/gssapi/test_context.c
+++ b/lib/gssapi/test_context.c
@@ -145,15 +145,16 @@ loop(gss_OID mechoid,
     int server_done = 0, client_done = 0;
     int num_loops = 0;
     OM_uint32 maj_stat, min_stat;
-    gss_name_t gss_target_name, src_name;
-    gss_buffer_desc input_token, output_token;
+    gss_name_t gss_target_name, src_name = GSS_C_NO_NAME;
+    gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
 #ifdef DO_IMPORT_EXPORT_OF_CLIENT_CONTEXT
     gss_buffer_desc cctx_tok = GSS_C_EMPTY_BUFFER;
 #endif
     gss_buffer_desc sctx_tok = GSS_C_EMPTY_BUFFER;
-    OM_uint32 flags = 0, ret_cflags, ret_sflags;
-    gss_OID actual_mech_client;
-    gss_OID actual_mech_server;
+    OM_uint32 flags = 0, ret_cflags = 0, ret_sflags = 0;
+    gss_OID actual_mech_client = GSS_C_NO_OID;
+    gss_OID actual_mech_server = GSS_C_NO_OID;
     struct gss_channel_bindings_struct i_channel_bindings_data = {0};
     struct gss_channel_bindings_struct a_channel_bindings_data = {0};
     gss_channel_bindings_t i_channel_bindings_p = GSS_C_NO_CHANNEL_BINDINGS;
diff --git a/lib/hdb/test_namespace.c b/lib/hdb/test_namespace.c
index a007db343..ea6ca8204 100644
--- a/lib/hdb/test_namespace.c
+++ b/lib/hdb/test_namespace.c
@@ -134,7 +134,7 @@ TDB__get(krb5_context context, HDB *db, krb5_data key, krb5_data *reply)
 {
     krb5_error_code ret = 0;
     TEST_HDB *tdb = (void *)db;
-    heim_object_t k, v;
+    heim_object_t k, v = NULL;
 
     if ((k = heim_data_create(key.data, key.length)) == NULL)
         ret = krb5_enomem(context);
@@ -479,12 +479,14 @@ fetch_entries(krb5_context context,
               int must_fail)
 {
     krb5_error_code ret = 0;
-    krb5_principal p;
+    krb5_principal p = NULL;
     krb5_keyblock base_key, dk;
     hdb_entry_ex *ep;
     hdb_entry_ex no;
     size_t i, b;
-    int toffset;
+    int toffset = 0;
+
+    memset(&base_key, 0, sizeof(base_key));
 
     /* Work out offset of first entry in `e[]' */
     assert(kr < sizeof(krs) / sizeof(krs[0]));
@@ -808,7 +810,7 @@ main(int argc, char **argv)
     krb5_error_code ret;
     krb5_context context;
     size_t i;
-    HDB *db;
+    HDB *db = NULL;
 
     setprogname(argv[0]);
     memset(e, 0, sizeof(e));