Fix potentially uninitialised variables in the Windows tools

7 files changed, 19 insertions, 7 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 6697697b9d..e5b973d08d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,14 @@
+2022-05-19  Nick Clifton  <nickc@redhat.com>
+
+	* dlltool.c (run): Initialise errmsg_fmt.
+	* dllwrap.c (run): Likewise.
+	* resrc.c (run_cmd): Likewise.
+	* mclex.c (mc_add_keyword): Initialise usz.
+	* srconv.c (wd_hd): Initialise hd.spare2.
+	* windmc.c (mc_add_node_lang): Initialise s.
+	(mc_generate_bin_item): Initialise cvt_txt.
+	(main): Initialise u.
+
 2022-05-18  Nick Clifton  <nickc@redhat.com>
 
 	PR 29135
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 89871510b4..e2af208470 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -1268,7 +1268,7 @@ run (const char *what, char *args)
   int pid, wait_status;
   int i;
   const char **argv;
-  char *errmsg_fmt, *errmsg_arg;
+  char *errmsg_fmt = NULL, *errmsg_arg = NULL;
   char *temp_base = choose_temp_base ();
 
   inform (_("run: %s %s"), what, args);
diff --git a/binutils/dllwrap.c b/binutils/dllwrap.c
index 713322905c..1be3cec72f 100644
--- a/binutils/dllwrap.c
+++ b/binutils/dllwrap.c
@@ -350,7 +350,7 @@ run (const char *what, char *args)
   int pid, wait_status, retcode;
   int i;
   const char **argv;
-  char *errmsg_fmt, *errmsg_arg;
+  char *errmsg_fmt = NULL, *errmsg_arg = NULL;
   char *temp_base = choose_temp_base ();
   int in_quote;
   char sep;
diff --git a/binutils/mclex.c b/binutils/mclex.c
index fd2888625b..fe6f127d90 100644
--- a/binutils/mclex.c
+++ b/binutils/mclex.c
@@ -212,7 +212,7 @@ enum_severity (int e)
 static void
 mc_add_keyword_ascii (const char *sz, int rid, const char *grp, rc_uint_type nv, const char *sv)
 {
-  unichar *usz, *usv = NULL;
+  unichar *usz = NULL, *usv = NULL;
   rc_uint_type usz_len;
 
   unicode_from_codepage (&usz_len, &usz, sz, CP_ACP);
diff --git a/binutils/resrc.c b/binutils/resrc.c
index 249eb9a87e..42afdc1d95 100644
--- a/binutils/resrc.c
+++ b/binutils/resrc.c
@@ -200,7 +200,7 @@ run_cmd (char *cmd, const char *redir)
   int pid, wait_status, retcode;
   int i;
   const char **argv;
-  char *errmsg_fmt, *errmsg_arg;
+  char *errmsg_fmt = NULL, *errmsg_arg = NULL;
   char *temp_base = choose_temp_base ();
   int in_quote;
   char sep;
diff --git a/binutils/srconv.c b/binutils/srconv.c
index c77db99a9e..6fc98bc49d 100644
--- a/binutils/srconv.c
+++ b/binutils/srconv.c
@@ -316,6 +316,7 @@ wr_hd (struct coff_ofile *p)
   struct IT_hd hd;
 
   hd.spare1 = 0;
+  hd.spare2 = 0;
   if (bfd_get_file_flags (abfd) & EXEC_P)
     hd.mt = MTYPE_ABS_LM;
   else
diff --git a/binutils/windmc.c b/binutils/windmc.c
index f9a41694be..b47da91f1b 100644
--- a/binutils/windmc.c
+++ b/binutils/windmc.c
@@ -338,7 +338,7 @@ mc_add_node_lang (mc_node *root, const mc_keyword *lang, rc_uint_type vid)
 static char *
 convert_unicode_to_ACP (const unichar *usz)
 {
-  char *s;
+  char *s = NULL;
   rc_uint_type l;
 
   if (! usz)
@@ -607,7 +607,7 @@ mc_generate_bin_item (mc_node_lang *n, rc_uint_type *res_len)
   else
     {
       rc_uint_type txt_len, l;
-      char *cvt_txt;
+      char *cvt_txt = NULL;
 
       codepage_from_unicode( &l, n->message, &cvt_txt, n->lang->lang_info.wincp);
       if (! cvt_txt)
@@ -1105,7 +1105,7 @@ main (int argc, char **argv)
 
   /* Load the input file and do code page transformations to UTF16.  */
   {
-    unichar *u;
+    unichar *u = NULL;
     rc_uint_type ul;
     char *buff;
     bfd_size_type flen;