keep trailing delimiter with SFTP open #743
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JacobBarthelmeh
changed the title
JacobBarthelmeh
commented
Oct 10, 2024
src/internal.c
Outdated
| out[0] = '/'; | ||
| curSz++; | ||
| } | ||
| out[curSz] = 0; |
There was a problem hiding this comment.
sanity checks needed on curSz before use (thanks @douzzer )
JacobBarthelmeh
assigned JacobBarthelmeh and wolfSSL-Bot and unassigned wolfSSL-Bot and JacobBarthelmeh
douzzer
requested changes
Oct 15, 2024
Comment on lines
+15729
to
+15738
| if (!WOLFSSH_SFTP_IS_DELIM(out[0])) { | ||
| if (curSz + 1 < *outSz) { | ||
| WMEMMOVE(out+1, out, curSz); | ||
| out[0] = '/'; | ||
| } | ||
| curSz++; | ||
| } | ||
| if (curSz < *outSz) { | ||
| out[curSz] = 0; | ||
| } |
There was a problem hiding this comment.
As discussed, when *outSz is to small to accommodate the shifted data with the terminating null, an error code should be returned, and checked for by callers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ZD 18566
Fix for SFTP cases with trailing delimiter.
OpenSSH client 9.6 (which does a SFTP command instead of SCP, -O restores using SCP protocol)
Before this change wolfSSH would allow test.txt to be copied to /tmp/subfolder/test. After this change the command correctly fails.