beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Shell: Fix silly stack overflow in 'cd' builtin

Browse source 
Let's write in C++ and we won't have as many C problems. :^)
This commit is contained in:
Andreas Kling 2020-03-07 10:59:23 +01:00
parent 830a57c6b2
commit 8f25dbf394
Notes: sideshowbarker 2024-07-19 08:51:22 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/8f25dbf3949
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Shell/main.cpp
View file

@ -187,33 +187,35 @@ static String expand_tilde(const char* expression)
static int sh_cd(int argc, const char** argv)
{
char pathbuf[PATH_MAX];
String new_path;
if (argc == 1) {
strcpy(pathbuf, g.home.characters());
new_path = g.home;
} else {
if (strcmp(argv[1], "-") == 0) {
char* oldpwd = getenv("OLDPWD");
if (oldpwd == nullptr)
return 1;
size_t len = strlen(oldpwd);
ASSERT(len + 1 <= PATH_MAX);
memcpy(pathbuf, oldpwd, len + 1);
new_path = oldpwd;
} else if (argv[1][0] == '~') {
auto path = expand_tilde(argv[1]);
if (path.is_empty())
return 1;
strcpy(pathbuf, path.characters());
new_path = path;
} else if (argv[1][0] == '/') {
memcpy(pathbuf, argv[1], strlen(argv[1]) + 1);
new_path = argv[1];
} else {
sprintf(pathbuf, "%s/%s", g.cwd.characters(), argv[1]);
StringBuilder builder;
builder.append(g.cwd);
builder.append('/');
builder.append(argv[1]);
new_path = builder.to_string();
}
}
FileSystemPath canonical_path(pathbuf);
FileSystemPath canonical_path(new_path);
if (!canonical_path.is_valid()) {
printf("FileSystemPath failed to canonicalize '%s'\n", pathbuf);
printf("FileSystemPath failed to canonicalize '%s'\n", new_path.characters());
return 1;
}
const char* path = canonical_path.string().characters();