Changeset 7a9d968 for protocols/jabber/s5bytestream.c

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

File:

• protocols/jabber/s5bytestream.c (modified) (4 diffs)

protocols/jabber/s5bytestream.c

@@ -500 +500 @@
         case BS_PHASE_REPLY:
         {
-                struct socks5_message socks5_reply;
+                struct socks5_message socks5_reply = {0};
                 int ret;
 
@@ -888 +888 @@
         char *proxy, *next, *errmsg = NULL;
         char port[6];
-        char host[HOST_NAME_MAX + 1];
+        char host[NI_MAXHOST + 1];
         jabber_streamhost_t *sh, *sh2;
         GSList *streamhosts = jd->streamhosts;
@@ -1046 +1046 @@
                         unsigned char nmethods;
                         unsigned char method;
-                } socks5_hello;
+                } socks5_hello = {0};
 
                 if (!(ret = jabber_bs_peek(bt, &socks5_hello, sizeof(socks5_hello)))) {
@@ -1091 +1091 @@
         case BS_PHASE_REQUEST:
         {
-                struct socks5_message socks5_connect;
+                struct socks5_message socks5_connect = {0};
                 int msgsize = sizeof(struct socks5_message);
                 int ret;