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

Merge pull request #251 from JacobBarthelmeh/sftp 

free name list after done and fix clean_path
pull/211/head
John Safranek 2020-03-03 15:06:40 -08:00 committed by GitHub
parent e043b9455f cc7db42475
commit 2c710dcfd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/sftpclient/sftpclient.c
View File

@ -1232,6 +1232,7 @@ static int doAutopilot(int cmd, char* local, char* remote)
} }
} }
wolfSSH_SFTPNAME_list_free(name);
return ret; return ret;
} }

5
src/internal.c
View File

@ -8693,7 +8693,7 @@ void clean_path(char* path)
sz = (int)WSTRLEN(path); sz = (int)WSTRLEN(path);
/* remove any /./ patterns */ /* remove any /./ patterns */
for (i = 0; i < sz; i++) { for (i = 1; i + 1 < sz; i++) {
if (path[i] == '.' && path[i - 1] == WS_DELIM && path[i + 1] == WS_DELIM) { if (path[i] == '.' && path[i - 1] == WS_DELIM && path[i + 1] == WS_DELIM) {
WMEMMOVE(path + i, path + i + 1, sz - i + 1); WMEMMOVE(path + i, path + i + 1, sz - i + 1);
sz -= 1; sz -= 1;
@ -8842,6 +8842,7 @@ void DumpOctetString(const byte* input, word32 inputSz)
int wolfSSH_oct2dec(WOLFSSH* ssh, byte* oct, word32 octSz) int wolfSSH_oct2dec(WOLFSSH* ssh, byte* oct, word32 octSz)
{ {
int ret; int ret;
word32 i;
if (octSz > WOLFSSH_MAX_OCTET_LEN || ssh == NULL || oct == NULL) { if (octSz > WOLFSSH_MAX_OCTET_LEN || ssh == NULL || oct == NULL) {
return WS_BAD_ARGUMENT; return WS_BAD_ARGUMENT;
@ -8850,7 +8851,7 @@ int wolfSSH_oct2dec(WOLFSSH* ssh, byte* oct, word32 octSz)
/* convert octal string to int without mp_read_radix() */ /* convert octal string to int without mp_read_radix() */
ret = 0; ret = 0;
for (word32 i = 0; i < octSz; i++) for (i = 0; i < octSz; i++)
{ {
if (oct[i] < '0' || oct[0] > '7') { if (oct[i] < '0' || oct[0] > '7') {
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;