From 1999202fabd0ec2a42eb1274975c294f03cf33c8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 23 Dec 2018 17:40:46 +0100 Subject: Revert "libssh: no data pointer == nothing to do" This reverts commit c98ee5f67f497195c9127cc70fa53a487f994cd5. --- lib/ssh-libssh.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c index 77dc098f2..2e920f0e9 100644 --- a/lib/ssh-libssh.c +++ b/lib/ssh-libssh.c @@ -554,19 +554,14 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block) { CURLcode result = CURLE_OK; struct Curl_easy *data = conn->data; - struct SSHPROTO *protop; + struct SSHPROTO *protop = data->req.protop; struct ssh_conn *sshc = &conn->proto.sshc; int rc = SSH_NO_ERROR, err; char *new_readdir_line; int seekerr = CURL_SEEKFUNC_OK; const char *err_msg; *block = 0; /* we're not blocking by default */ - if(!data) { - state(conn, SSH_STOP); - return CURLE_OK; - } - protop = data->req.protop; do { switch(sshc->state) { @@ -1993,10 +1988,6 @@ static CURLcode myssh_block_statemach(struct connectdata *conn, struct ssh_conn *sshc = &conn->proto.sshc; CURLcode result = CURLE_OK; struct Curl_easy *data = conn->data; - if(!data) { - state(conn, SSH_STOP); - return CURLE_OK; - } while((sshc->state != SSH_STOP) && !result) { bool block; -- cgit v1.2.1