Skip to content

nshlib: Fix stack-buffer-overflow of nsh_redirect() #2699

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

Merged
xiaoxiang781216 merged 2 commits into from
Oct 13, 2024
Merged

nshlib: Fix stack-buffer-overflow of nsh_redirect() #2699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a2682e
nshlib: Fix stack-buffer-overflow of nsh_redirect()
JianyuWang0623 Oct 12, 2024
ca74f6d
nshlib: Fix a typo error of redirect
JianyuWang0623 Oct 12, 2024
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
2 changes: 1 addition & 1 deletion nshlib/nsh_console.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
* See struct serialsave_s in nsh_console.c
*/

#define SAVE_SIZE (2 * sizeof(int))
#define SAVE_SIZE (3 * sizeof(int))

/* Are we using the NuttX console for I/O? Or some other character device? */

Expand Down
4 changes: 3 additions & 1 deletion nshlib/nsh_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2855,10 +2855,12 @@ static int nsh_parse_command(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline)
vtbl->np.np_redir_out = redirect_out_save;
}

/* Free the redirected input file path */

if (redirfile_in)
{
nsh_freefullpath(redirfile_in);
vtbl->np.np_redir_out = redirect_in_save;
vtbl->np.np_redir_in = redirect_in_save;
}

dynlist_free:
Expand Down