commit 93792b5aa6806646674795504419f3e97862685c Author: Steven Murdoch Steven.Murdoch@cl.cam.ac.uk Date: Mon Aug 29 00:36:41 2011 +0100

Add a sanity check --- src/common/util.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c index 371e09b..dd2d111 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3462,10 +3462,11 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, HANDLE hProcess) continue; }

+ /* There is data to read; read it */ retval = ReadFile(h, buf+numread, count-numread, &byte_count, NULL); + tor_assert(byte_count + numread <= count); if (!retval) { - log_warn(LD_GENERAL, - "Failed to read from handle: %s", + log_warn(LD_GENERAL, "Failed to read from handle: %s", format_win32_error(GetLastError())); return -1; } else if (0 == byte_count) {