Merge remote-tracking branch 'upstream/master'

Author: boothj5

src/conn.c

@@ -435,8 +435,8 @@ int xmpp_connect_client(xmpp_conn_t * const conn,
     resolver_srv_rr_t *srv_rr_list = NULL;
     resolver_srv_rr_t *rr;
     char *domain;
-    const char *host;
-    unsigned short port;
+    const char *host = NULL;
+    unsigned short port = 0;
     int found = XMPP_DOMAIN_NOT_FOUND;
     int rc;
 
@@ -1192,6 +1192,7 @@ static int _conn_connect(xmpp_conn_t * const conn,
 
     if (conn->state != XMPP_STATE_DISCONNECTED) return XMPP_EINVOP;
     if (type != XMPP_CLIENT && type != XMPP_COMPONENT) return XMPP_EINVOP;
+    if (host == NULL || port == 0) return XMPP_EINT;
 
     _conn_reset(conn);
 

tests/test_string.c

@@ -58,7 +58,7 @@ static int test_strtok_r(void)
 static int test_strdup_one(xmpp_ctx_t *ctx, const char *s)
 {
     char *s1, *s2;
-    int rc;
+    int rc = 0;
 
     s1 = strdup(s);
     s2 = xmpp_strdup(ctx, s);