Skip to content

worktree: Fix out of bounds read that causes data loss and reject invalid empty input in worktree add #2187

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
rimrul wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −7
Open

worktree: Fix out of bounds read that causes data loss and reject invalid empty input in worktree add #2187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc69c6
worktree: don't read out of bounds
rimrul Jul 25, 2026
ec682d7
worktree: reject empty string
rimrul Jul 25, 2026
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
20 changes: 13 additions & 7 deletions builtin/worktree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,17 +297,21 @@ static void remove_junk_on_signal(int signo)
static const char *worktree_basename(const char *path, int *olen)
{
const char *name;
int len;
int len, len2;

len = strlen(path);
len2 = len = strlen(path);
while (len && is_dir_sep(path[len - 1]))
len--;

for (name = path + len - 1; name > path; name--)
if (is_dir_sep(*name)) {
name++;
break;
}
if(len) {
for (name = path + len - 1; name > path; name--)
if (is_dir_sep(*name)) {
name++;
break;
}
}
else
name = path + len2;

*olen = len;
return name;
Expand Down Expand Up @@ -492,6 +496,8 @@ static int add_worktree(const char *path, const char *refname,
die(_("invalid reference: %s"), refname);

name = worktree_basename(path, &len);
if (!len)
die(_("the empty string is not a valid worktree"));
strbuf_add(&sb, name, path + len - name);
sanitize_refname_component(sb.buf, &sb_name);
if (!sb_name.len)
Expand Down
Loading