Skip to content

fix: ParseScpCommand leaks scpBasePathDynamic on repeated -t/-f #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkAtwood wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ParseScpCommand leaks scpBasePathDynamic on repeated -t/-f #1125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/wolfscp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1540,13 +1540,21 @@ int ParseScpCommand(WOLFSSH* ssh)

case 't':
ssh->scpDirection = WOLFSSH_SCP_TO;
ssh->scpBasePathSz = cmdSz + WOLFSSH_MAX_FILENAME;
if (ssh->scpBasePathDynamic != NULL) {
WFREE(ssh->scpBasePathDynamic, ssh->ctx->heap,
DYNTYPE_BUFFER);
ssh->scpBasePathDynamic = NULL;
/* scpBasePath aliases the buffer just freed */
ssh->scpBasePath = NULL;
ssh->scpBasePathSz = 0;
}
ssh->scpBasePathDynamic = (char*)WMALLOC(
ssh->scpBasePathSz,
cmdSz + WOLFSSH_MAX_FILENAME,
ssh->ctx->heap, DYNTYPE_BUFFER);
if (ssh->scpBasePathDynamic == NULL) {
return WS_MEMORY_E;
}
ssh->scpBasePathSz = cmdSz + WOLFSSH_MAX_FILENAME;
WMEMSET(ssh->scpBasePathDynamic, 0, ssh->scpBasePathSz);
if (idx + 2 < cmdSz) {
/* skip space */
Expand All @@ -1567,13 +1575,21 @@ int ParseScpCommand(WOLFSSH* ssh)

case 'f':
ssh->scpDirection = WOLFSSH_SCP_FROM;
ssh->scpBasePathSz = cmdSz + WOLFSSH_MAX_FILENAME;
if (ssh->scpBasePathDynamic != NULL) {
WFREE(ssh->scpBasePathDynamic, ssh->ctx->heap,
DYNTYPE_BUFFER);
ssh->scpBasePathDynamic = NULL;
/* scpBasePath aliases the buffer just freed */
ssh->scpBasePath = NULL;
ssh->scpBasePathSz = 0;
}
ssh->scpBasePathDynamic = (char*)WMALLOC(
ssh->scpBasePathSz,
cmdSz + WOLFSSH_MAX_FILENAME,
ssh->ctx->heap, DYNTYPE_BUFFER);
if (ssh->scpBasePathDynamic == NULL) {
return WS_MEMORY_E;
}
ssh->scpBasePathSz = cmdSz + WOLFSSH_MAX_FILENAME;
WMEMSET(ssh->scpBasePathDynamic, 0, ssh->scpBasePathSz);
if (idx + 2 < cmdSz) {
/* skip space */
Expand All @@ -1596,6 +1612,11 @@ int ParseScpCommand(WOLFSSH* ssh)
ssh->scpDirection != WOLFSSH_SCP_FROM) {
ret = WS_SCP_CMD_E;
}
else if (ret == WS_SUCCESS && ssh->scpBasePath == NULL) {
/* direction set but no path parsed; don't hand a NULL base
* path to the scp callbacks */
ret = WS_SCP_CMD_E;
}
}

return ret;
Expand Down
Loading