scan-build fixes

pull/134/head
John Safranek 2018-12-27 17:53:05 -08:00
parent 41beb69794
commit bf89f60f14
1 changed files with 6 additions and 2 deletions

View File

@ -4153,7 +4153,7 @@ int wolfSSH_SFTP_SendReadPacket(WOLFSSH* ssh, byte* handle, word32 handleSz,
ssh->ctx->heap, DYNTYPE_SFTP_STATE); ssh->ctx->heap, DYNTYPE_SFTP_STATE);
ssh->sendReadState = NULL; ssh->sendReadState = NULL;
} }
return WS_SUCCESS; return ret;
default: default:
WLOG(WS_LOG_DEBUG, "Bad SFTP Send Read Packet state, " WLOG(WS_LOG_DEBUG, "Bad SFTP Send Read Packet state, "
@ -4760,6 +4760,10 @@ int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
} }
} }
} while (sz > 0 && ssh->sftpInt == 0); } while (sz > 0 && ssh->sftpInt == 0);
if (ret != WS_SUCCESS) {
state->state = STATE_GET_CLEANUP;
continue;
}
if (ssh->sftpInt) { if (ssh->sftpInt) {
WLOG(WS_LOG_SFTP, "Interrupted, trying to save offset"); WLOG(WS_LOG_SFTP, "Interrupted, trying to save offset");
wolfSSH_SFTP_SaveOfst(ssh, from, to, state->gOfst); wolfSSH_SFTP_SaveOfst(ssh, from, to, state->gOfst);
@ -4791,7 +4795,7 @@ int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
WFREE(ssh->getState, ssh->ctx->heap, DYNTYPE_SFTP_STATE); WFREE(ssh->getState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
ssh->getState = NULL; ssh->getState = NULL;
} }
return WS_SUCCESS; return ret;
default: default:
WLOG(WS_LOG_DEBUG, "Bad SFTP Get state, program error"); WLOG(WS_LOG_DEBUG, "Bad SFTP Get state, program error");