resolve conflicts after rebase

Author: leonardocavagnis

libraries/SocketWrapper/SocketWrapper.h

@@ -142,7 +142,8 @@ class ZephyrSocketWrapper {
 			ret = tls_credential_add(CA_CERTIFICATE_TAG, TLS_CREDENTIAL_CA_CERTIFICATE,
 									 ca_certificate_pem, strlen(ca_certificate_pem) + 1);
 			if (ret != 0) {
-				goto exit;
+				if (res) freeaddrinfo(res);
+				return false;
 			}
 		}
 
@@ -152,12 +153,13 @@ class ZephyrSocketWrapper {
 			return false;
         }
 
-	sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
+		sock_fd = std::shared_ptr<int>(new int(raw_sock_fd), socket_deleter());
 
 		if (setsockopt(*sock_fd, SOL_TLS, TLS_HOSTNAME, host, strlen(host)) ||
 			setsockopt(*sock_fd, SOL_TLS, TLS_SEC_TAG_LIST, sec_tag_opt, sizeof(sec_tag_opt)) ||
 			setsockopt(*sock_fd, SOL_SOCKET, SO_RCVTIMEO, &timeout_opt, sizeof(timeout_opt))) {
-			goto exit;
+			if (res) freeaddrinfo(res);
+			return false;
 		}
 
 		if (::connect(*sock_fd, res->ai_addr, res->ai_addrlen) < 0) {