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

Merge pull request #160 from JacobBarthelmeh/testing 

fix for gcc 8 build warnings
pull/163/head
John Safranek 2019-04-30 08:59:56 -07:00 committed by GitHub
parent 8a3c94a59d 1fd4c2cc0c
commit 4ce4b72e1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wolfscp.c
View File

@ -697,9 +697,9 @@ WOLFSSH_API int wolfSSH_SetScpErrorMsg(WOLFSSH* ssh, const char* message)
ret = WS_BAD_ARGUMENT;
if (ret == WS_SUCCESS) {
valueSz = (word32)WSTRLEN(message);
valueSz = (word32)WSTRLEN(message) + 1;
if (valueSz > 0)
value = (char*)WMALLOC(valueSz + SCP_MIN_CONFIRM_SZ + 1,
value = (char*)WMALLOC(valueSz + SCP_MIN_CONFIRM_SZ,
ssh->ctx->heap, DYNTYPE_STRING);
if (value == NULL)
ret = WS_MEMORY_E;
@ -708,8 +708,8 @@ WOLFSSH_API int wolfSSH_SetScpErrorMsg(WOLFSSH* ssh, const char* message)
if (ret == WS_SUCCESS) {
/* leave room for cmd at beginning, add \n\0 at end */
WSTRNCPY(value + 1, message, valueSz);
*(value + valueSz + 1) = '\n';
*(value + valueSz + 2) = '\0';
*(value + valueSz) = '\n';
*(value + valueSz + 1) = '\0';
if (ssh->scpConfirmMsg != NULL) {
WFREE(ssh->scpConfirmMsg, ssh->ctx->heap, DYNTYPE_STRING);
@ -1071,7 +1071,7 @@ static int ParseBasePathHelper(WOLFSSH* ssh, int cmdSz)
return WS_BUFFER_E;
}
WSTRNCPY(buf, ssh->scpBasePath, sz);
WSTRNCPY(buf, ssh->scpBasePath, cmdSz);
buf[sz] = '\0';
WSTRNCAT(buf, "/..", sizeof("/.."));
clean_path(buf);

2
src/wolfsftp.c
View File

@ -919,7 +919,7 @@ static int wolfSSH_SFTP_RecvRealPath(WOLFSSH* ssh, int reqId, byte* data,
if (r[0] != '/' && r[1] != ':') {
char wd[WOLFSSH_MAX_FILENAME];
if (ssh->sftpDefaultPath) {
XSTRNCPY(wd, ssh->sftpDefaultPath, sizeof(wd));
XSTRNCPY(wd, ssh->sftpDefaultPath, WOLFSSH_MAX_FILENAME - 1);
}
else {
#ifndef USE_WINDOWS_API