Skip to content

Win32: fix opendir entry bounds handling #1706

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
val-ms wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −4
Open

Win32: fix opendir entry bounds handling #1706

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
11 changes: 7 additions & 4 deletions win32/compat/dirent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ DIR *opendir(const char *name)
DIR *d;
DWORD attrs;
int len;
const size_t entry_count = sizeof(d->entry) / sizeof(d->entry[0]);
struct stat sb;
wchar_t *wpath;

Expand All @@ -48,14 +49,16 @@ DIR *opendir(const char *name)
return NULL;
}
wpath = uncpath(name);
if (!wpath)
if (!wpath) {
free(d);
return NULL;
wcsncpy(d->entry, wpath, sizeof(d->entry) / sizeof(d->entry[0]));
}
wcsncpy(d->entry, wpath, entry_count - 1);
free(wpath);
d->entry[sizeof(d->entry) / sizeof(d->entry[0])] = L'\0';
d->entry[entry_count - 1] = L'\0';
len = wcslen(d->entry);

if (len >= sizeof(d->entry) / sizeof(d->entry[0]) - 4) {
if (len >= (int)entry_count - 4) {
free(d);
errno = ENAMETOOLONG;
return NULL;
Expand Down
Loading