summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-12-23 17:40:46 +0100
committerDaniel Stenberg <daniel@haxx.se>2018-12-23 23:13:15 +0100
commit7608f9a2d57c26320a35f07d36fe20f6bde92fc4 (patch)
tree2f0945a5eb79e5bc90f63460a6b90f4ac6b29ba3 /lib
parentf3ce38739fa49008e36959aa8189c01ab1bad5b5 (diff)
downloadcurl-7608f9a2d57c26320a35f07d36fe20f6bde92fc4.tar.gz
Revert "libssh: no data pointer == nothing to do"
This reverts commit c98ee5f67f497195c9 since commit f3ce38739fa fixed the problem in a more generic way.
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh-libssh.c11
1 files changed, 1 insertions, 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;