From a51b63afddf45648c681359770c84ee77f4bfe5e Mon Sep 17 00:00:00 2001 From: Arseny Smirnov Date: Sat, 27 Mar 2021 11:02:32 +0300 Subject: [PATCH] more checks for watch os version --- tdnet/td/net/Wget.cpp | 3 +++ tdutils/td/utils/port/SocketFd.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/tdnet/td/net/Wget.cpp b/tdnet/td/net/Wget.cpp index a6723ec43..7f961e3a6 100644 --- a/tdnet/td/net/Wget.cpp +++ b/tdnet/td/net/Wget.cpp @@ -74,6 +74,9 @@ Status Wget::try_init() { TRY_STATUS(addr.init_host_port(url.host_, url.port_, prefer_ipv6_)); TRY_RESULT(fd, SocketFd::open(addr)); + if (fd.empty()) { + return td::Status::Error("Sockets are not supported"); + } if (url.protocol_ == HttpUrl::Protocol::Http) { connection_ = create_actor("Connect", std::move(fd), SslStream{}, std::numeric_limits::max(), 0, 0, diff --git a/tdutils/td/utils/port/SocketFd.cpp b/tdutils/td/utils/port/SocketFd.cpp index a29070859..05e6aee4b 100644 --- a/tdutils/td/utils/port/SocketFd.cpp +++ b/tdutils/td/utils/port/SocketFd.cpp @@ -629,29 +629,36 @@ bool SocketFd::empty() const { } PollableFdInfo &SocketFd::get_poll_info() { + CHECK(!empty()); return impl_->get_poll_info(); } const PollableFdInfo &SocketFd::get_poll_info() const { + CHECK(!empty()); return impl_->get_poll_info(); } const NativeFd &SocketFd::get_native_fd() const { + CHECK(!empty()); return impl_->get_native_fd(); } Status SocketFd::get_pending_error() { + CHECK(!empty()); return impl_->get_pending_error(); } Result SocketFd::write(Slice slice) { + CHECK(!empty()); return impl_->write(slice); } Result SocketFd::writev(Span slices) { + CHECK(!empty()); return impl_->writev(slices); } Result SocketFd::read(MutableSlice slice) { + CHECK(!empty()); return impl_->read(slice); }