You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2016/05/24 05:54:15 UTC
[trafficserver] branch master updated: TS-4467: Fix assert
conditions (#655)
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4b4e12a TS-4467: Fix assert conditions (#655)
4b4e12a is described below
commit 4b4e12a494261eb9217eb8412f80dc63736db741
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue May 24 14:54:07 2016 +0900
TS-4467: Fix assert conditions (#655)
---
iocore/net/SSLNetVConnection.cc | 2 +-
iocore/net/UnixNetVConnection.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 5aa577a..cffe487 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -359,7 +359,7 @@ SSLNetVConnection::read_raw_data()
}
ink_assert(niov > 0);
- ink_assert(niov < countof(tiovec));
+ ink_assert(niov <= countof(tiovec));
r = socketManager.readv(this->con.fd, &tiovec[0], niov);
NET_INCREMENT_DYN_STAT(net_calls_to_read_stat);
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index e6b0f94..2a903cf 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -315,7 +315,7 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
}
ink_assert(niov > 0);
- ink_assert(niov < countof(tiovec));
+ ink_assert(niov <= countof(tiovec));
r = socketManager.readv(vc->con.fd, &tiovec[0], niov);
NET_INCREMENT_DYN_STAT(net_calls_to_read_stat);
@@ -992,7 +992,7 @@ UnixNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted,
wattempted = total_written - total_written_last;
ink_assert(niov > 0);
- ink_assert(niov < countof(tiovec));
+ ink_assert(niov <= countof(tiovec));
r = socketManager.writev(con.fd, &tiovec[0], niov);
if (origin_trace) {
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].