summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2015-02-25 00:01:14 +0100
committerMarc Hoersken <info@marc-hoersken.de>2015-02-25 00:01:14 +0100
commitb3bcdaf01a1123bd1b7a8c32f4fc73d145c51d38 (patch)
tree42f0ea5fdb9f788062daea4750004a734a9a405c
parent03fa576833643c67579ae216c4e7350fa9b5f2fe (diff)
downloadcurl-b3bcdaf01a1123bd1b7a8c32f4fc73d145c51d38.tar.gz
telnet.c: fix invalid use of custom read function if not being set
obj_count can be 1 if the custom read function is set or the stdin handle is a reference to a pipe. Since the pipe should be handled using the PeekNamedPipe-check below, the custom read function should only be used if it is actually enabled.
-rw-r--r--lib/telnet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/telnet.c b/lib/telnet.c
index 236e59286..6904c4ce3 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -1427,7 +1427,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
case WAIT_TIMEOUT:
{
for(;;) {
- if(obj_count == 1) {
+ if(data->set.is_fread_set) {
/* read from user-supplied method */
result = (int) conn->fread_func(buf, 1, BUFSIZE - 1, conn->fread_in);
if(result == CURL_READFUNC_ABORT) {