You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/05/21 20:25:48 UTC
git commit: [TS-2822] Adding check for zero length reads
Repository: trafficserver
Updated Branches:
refs/heads/master 13453d9ab -> 883a3d2c8
[TS-2822] Adding check for zero length reads
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/883a3d2c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/883a3d2c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/883a3d2c
Branch: refs/heads/master
Commit: 883a3d2c8f31ed4b7b004cb980a7307f88b760cb
Parents: 13453d9
Author: Brian Geffon <br...@apache.org>
Authored: Wed May 21 11:25:41 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Wed May 21 11:25:41 2014 -0700
----------------------------------------------------------------------
proxy/logstats.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/883a3d2c/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 5d07df1..e594551 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -1752,7 +1752,7 @@ process_file(int in_fd, off_t offset, unsigned max_age)
nread = 0;
do {
nread = read(in_fd, &buffer[sizeof(LogBufferHeader) + total_read], buffer_bytes - total_read);
- if (EOF == nread) { // just bail on error
+ if (EOF == nread || !nread) { // just bail on error
Debug("logstats", "Read failed while reading log buffer, wanted %d bytes, nread=%d, errno=%d", buffer_bytes - total_read, nread, errno);
return 1;
} else {