Set sock to invalid after closing.

eclipse · Sep 17, 2019 · b5880f5 · b5880f5
1 parent a379416
commit b5880f5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
@@ -607,12 +607,14 @@ static int net__init_ssl_ctx(struct mosquitto *mosq)
  if(!engine){
  log__printf(mosq, MOSQ_LOG_ERR, "Error loading %s engine\n", mosq->tls_engine);
  COMPAT_CLOSE(mosq->sock);
+ mosq->sock = INVALID_SOCKET;
  return MOSQ_ERR_TLS;
  }
  if(!ENGINE_init(engine)){
  log__printf(mosq, MOSQ_LOG_ERR, "Failed engine initialisation\n");
  ENGINE_free(engine);
  COMPAT_CLOSE(mosq->sock);
+ mosq->sock = INVALID_SOCKET;
  return MOSQ_ERR_TLS;
  }
  ENGINE_set_default(engine, ENGINE_METHOD_ALL);
@@ -698,13 +700,15 @@ static int net__init_ssl_ctx(struct mosquitto *mosq)
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to set engine secret mode sha1");
  ENGINE_FINISH(engine);
  COMPAT_CLOSE(mosq->sock);
+ mosq->sock = INVALID_SOCKET;
  net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  if(!ENGINE_ctrl_cmd(engine, ENGINE_PIN, 0, mosq->tls_engine_kpass_sha1, NULL, 0)){
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to set engine pin");
  ENGINE_FINISH(engine);
  COMPAT_CLOSE(mosq->sock);
+ mosq->sock = INVALID_SOCKET;
  net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
@@ -715,13 +719,15 @@ static int net__init_ssl_ctx(struct mosquitto *mosq)
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to load engine private key file \"%s\".", mosq->tls_keyfile);
  ENGINE_FINISH(engine);
  COMPAT_CLOSE(mosq->sock);
+ mosq->sock = INVALID_SOCKET;
  net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  if(SSL_CTX_use_PrivateKey(mosq->ssl_ctx, pkey) <= 0){
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to use engine private key file \"%s\".", mosq->tls_keyfile);
  ENGINE_FINISH(engine);
  COMPAT_CLOSE(mosq->sock);
+ mosq->sock = INVALID_SOCKET;
  net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
@@ -948,12 +954,14 @@ int net__socket_nonblock(mosq_sock_t *sock)
  if(fcntl(*sock, F_SETFL, opt | O_NONBLOCK) == -1){
  /* If either fcntl fails, don't want to allow this client to connect. */
  COMPAT_CLOSE(*sock);
+ *sock = INVALID_SOCKET;
  return MOSQ_ERR_ERRNO;
  }
 #else
  unsigned long opt = 1;
  if(ioctlsocket(*sock, FIONBIO, &opt)){
  COMPAT_CLOSE(*sock);
+ mosq->sock = INVALID_SOCKET;
  return MOSQ_ERR_ERRNO;
  }
 #endif