8 files changed, 10 insertions, 9 deletions
diff --git a/imap/src/c-client/imap4r1.c b/imap/src/c-client/imap4r1.c
index b4479e72..155b4d5c 100644
--- a/imap/src/c-client/imap4r1.c
+++ b/imap/src/c-client/imap4r1.c
@@ -1186,7 +1186,7 @@ long imap_anon (MAILSTREAM *stream,char *tmp)
 
 long imap_auth (MAILSTREAM *stream,NETMBX *mb,char *tmp,char *usr)
 {
-  unsigned long trial,ua,uasaved;
+  unsigned long trial,ua,uasaved = NIL;
   int ok;
   char tag[16];
   char *lsterr = NIL, *base;
diff --git a/imap/src/c-client/json.c b/imap/src/c-client/json.c
index 973c8ff5..1dd9c999 100644
--- a/imap/src/c-client/json.c
+++ b/imap/src/c-client/json.c
@@ -209,7 +209,7 @@ json_strchr(unsigned char *s, unsigned char c)
 void *
 json_value_parse(unsigned char **s, JObjType *jtype)
 {
-  void *rv;
+  void *rv = NIL;
   unsigned char *u, *w;
   unsigned long *l;
 
diff --git a/imap/src/c-client/oauth2_aux.c b/imap/src/c-client/oauth2_aux.c
index bb4ddbcf..4ab538c7 100644
--- a/imap/src/c-client/oauth2_aux.c
+++ b/imap/src/c-client/oauth2_aux.c
@@ -104,7 +104,7 @@ JSON_S *oauth2_json_reply(OAUTH2_SERVER_METHOD_S RefreshMethod, OAUTH2_S *oauth2
 {
     JSON_S *json = NULL;
     HTTP_PARAM_S params[OAUTH2_PARAM_NUMBER];
-    HTTPSTREAM *stream;
+    HTTPSTREAM *stream = NIL;
     unsigned char *s;
     char *server = NULL;
 
diff --git a/imap/src/c-client/pop3.c b/imap/src/c-client/pop3.c
index d91b3ccd..89c3d9cb 100644
--- a/imap/src/c-client/pop3.c
+++ b/imap/src/c-client/pop3.c
@@ -555,7 +555,7 @@ long pop3_capa (MAILSTREAM *stream,long flags)
 
 long pop3_auth (MAILSTREAM *stream,NETMBX *mb,char *pwd,char *usr)
 {
-  unsigned long i,trial,auths = 0, authsaved;
+  unsigned long i,trial,auths = 0, authsaved = NIL;
   char *t, *app_pwd = NIL, *base;
   AUTHENTICATOR *at, *atsaved;
   long ret = NIL;
diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c
index 002e4107..bee34565 100644
--- a/imap/src/c-client/smtp.c
+++ b/imap/src/c-client/smtp.c
@@ -281,7 +281,7 @@ SENDSTREAM *smtp_open_full (NETDRIVER *dv,char **hostlist,char *service,
 
 long smtp_auth (SENDSTREAM *stream,NETMBX *mb,char *tmp)
 {
-  unsigned long trial,auths, authsaved;
+  unsigned long trial,auths, authsaved = NIL;
   char *lsterr = NIL;
   char usr[MAILTMPLEN], *base;
   AUTHENTICATOR *at, *atsaved;
diff --git a/imap/src/c-client/utf8.c b/imap/src/c-client/utf8.c
index be03bd10..418f94da 100644
--- a/imap/src/c-client/utf8.c
+++ b/imap/src/c-client/utf8.c
@@ -2422,7 +2422,7 @@ RECURSIVEMORE {
 
 unsigned long ucs4_decompose (unsigned long c,void **more)
 {
-  unsigned long i,ix,ret;
+  unsigned long i,ix,ret = c;
   struct decomposemore *m;
   if (c & U8G_ERROR) {		/* want to chase more? */
 				/* do sanity check */
diff --git a/imap/src/osdep/unix/dummy.c b/imap/src/osdep/unix/dummy.c
index 244a13cd..646f67ea 100644
--- a/imap/src/osdep/unix/dummy.c
+++ b/imap/src/osdep/unix/dummy.c
@@ -519,7 +519,7 @@ long dummy_delete (MAILSTREAM *stream,char *mailbox)
   struct stat sbuf;
   char *s,tmp[MAILTMPLEN];
   if (!(s = dummy_file (tmp,mailbox))) {
-    sprintf (tmp,"Can't delete - invalid name: %.80s",s);
+    sprintf (tmp,"Can't delete - invalid name: %.80s",mailbox);
     MM_LOG (tmp,ERROR);
   }
 				/* no trailing / (workaround BSD kernel bug) */
diff --git a/imap/src/osdep/unix/tcp_unix.c b/imap/src/osdep/unix/tcp_unix.c
index 6ddac4df..cf18bb6f 100644
--- a/imap/src/osdep/unix/tcp_unix.c
+++ b/imap/src/osdep/unix/tcp_unix.c
@@ -988,7 +988,7 @@ char *tcp_canonical (char *name)
 
 char *tcp_name (struct sockaddr *sadr,long flag)
 {
-  char *ret,*t,adr[MAILTMPLEN],tmp[MAILTMPLEN],buf[NI_MAXHOST];
+  char *ret,*t,adr[MAILTMPLEN],tmp[MAILTMPLEN+1],buf[NI_MAXHOST];
   sprintf (ret = adr,"[%.80s]",ip_sockaddrtostring (sadr,buf));
   if (allowreversedns) {
     blocknotify_t bn = (blocknotify_t)mail_parameters(NIL,GET_BLOCKNOTIFY,NIL);
@@ -1002,7 +1002,8 @@ char *tcp_name (struct sockaddr *sadr,long flag)
 				/* translate address to name */
     if ((t = tcp_name_valid (ip_sockaddrtoname (sadr,buf))) != NULL) {
 				/* produce verbose form if needed */
-      if (flag)	sprintf (ret = tmp,"%s %s",t,adr);
+      if (flag)	sprintf (ret = tmp,"%.*s %.*s", (int) strlen(t), t,
+				MAILTMPLEN - (int)strlen(t) - 1,adr);
       else ret = t;
     }
     (*bn) (BLOCK_NONSENSITIVE,data);