From 9583cfcebd65ec6ba8916e90aa289af08da3172f Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Mon, 27 Apr 2020 19:10:36 -0700
Subject: [PATCH] Release rollup 1. Fix a dead store by using the value. 2.
 Revert removing the clean from configure.

---
 configure.ac   | 5 +++++
 src/wolfsftp.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a73bb84..a870a5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,11 @@ AX_CREATE_GENERIC_CONFIG
 
 AC_OUTPUT
 
+# force make clean
+AS_ECHO(["---"])
+AS_ECHO(["Running make clean..."])
+make clean >/dev/null 2>&1
+
 # output config summary
 AS_ECHO(["---"])
 AS_ECHO(["Configuration summary for $PACKAGE_NAME version $VERSION"])
diff --git a/src/wolfsftp.c b/src/wolfsftp.c
index c5b7781..2e87015 100644
--- a/src/wolfsftp.c
+++ b/src/wolfsftp.c
@@ -1219,7 +1219,7 @@ int wolfSSH_SFTP_read(WOLFSSH* ssh)
 
                     if ((int)state->idx < state->sz) {
                         ret = wolfSSH_worker(ssh, NULL);
-                        if (ssh->error == WS_WANT_READ) {
+                        if (ret != WS_SUCCESS && ssh->error == WS_WANT_READ) {
                             /* was something there to read, try again */
                             state->toSend = 2;
                             return WS_FATAL_ERROR;