Skip to content

bpo-34711: On systems that open() a regular file with a trailing slash respond with ENOTDIR #9360

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

Closed
aixtools wants to merge 8 commits into from
Closed

bpo-34711: On systems that open() a regular file with a trailing slash respond with ENOTDIR #9360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3fa3e67
On systems that open() a regular file with a trailing slash as ENOTDIR
aixtools Sep 17, 2018
b20fb5c
add include<string.h>
aixtools Sep 17, 2018
3efddfe
typo correction of function name strrch() -> strrchr()
aixtools Sep 17, 2018
7fc053e
Modify per peer review and suggestion! Thx.
aixtools Sep 17, 2018
4d9eed1
remove unused variable
aixtools Sep 18, 2018
16c6c5e
ensure neither name nor widename are NULL before determing string length
aixtools Sep 18, 2018
cd6a1dc
modify code per peer review
aixtools Sep 25, 2018
c7bc7bf
modify code per peer review
aixtools Sep 25, 2018
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: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2018-09-17-13-45-00.bpo-34711.Dp4bkz.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
On systems that open() a regular file with a trailing slash as ENOTDIR
patch by Michael Felt
19 changes: 19 additions & 0 deletions Modules/_io/fileio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,25 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
}
}
else {
#if defined(S_ISREG) && defined(ENOTDIR)
/* On AIX and Windows, open() may succeed for files with a trailing slash.
The Open Group specifies filenames ending with a trailing slash should
be an error - ENOTDIR */
if (fd < 0 && S_ISREG(fdfstat.st_mode)) {
#ifdef MS_WINDOWS
size_t len = wcslen(widename);
if (len && (widename[len - 1] == L'\\' ||
widename[len - 1] == L'/')) {
#else
size_t len = strlen(name);
if (len && name[len - 1] == '/') {
#endif
errno = ENOTDIR;
PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, nameobj);
goto error;
}
}
#endif
#if defined(S_ISDIR) && defined(EISDIR)
/* On Unix, open will succeed for directories.
In Python, there should be no file objects referring to
Expand Down