WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Release rollup 

1. Fix a dead store by using the value.
2. Revert removing the clean from configure.
pull/254/head
John Safranek 2020-04-27 19:10:36 -07:00
parent a32b5ad4ae
commit 9583cfcebd
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -175,6 +175,11 @@ AX_CREATE_GENERIC_CONFIG
AC_OUTPUT AC_OUTPUT
# force make clean
AS_ECHO(["---"])
AS_ECHO(["Running make clean..."])
make clean >/dev/null 2>&1
# output config summary # output config summary
AS_ECHO(["---"]) AS_ECHO(["---"])
AS_ECHO(["Configuration summary for $PACKAGE_NAME version $VERSION"]) AS_ECHO(["Configuration summary for $PACKAGE_NAME version $VERSION"])

2
src/wolfsftp.c
View File

@ -1219,7 +1219,7 @@ int wolfSSH_SFTP_read(WOLFSSH* ssh)
if ((int)state->idx < state->sz) { if ((int)state->idx < state->sz) {
ret = wolfSSH_worker(ssh, NULL); 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 */ /* was something there to read, try again */
state->toSend = 2; state->toSend = 2;
return WS_FATAL_ERROR; return WS_FATAL_ERROR;