Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions Lib/test/test_os/test_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -2778,6 +2778,16 @@ def test_fpathconf_bad_fd(self):
self.check(os.pathconf, "PC_NAME_MAX")
self.check(os.fpathconf, "PC_NAME_MAX")

@unittest.skipUnless(hasattr(os, 'pathconf'), 'test needs os.pathconf()')
@unittest.skipIf(
support.linked_to_musl(),
'musl fpathconf ignores the file descriptor and returns a constant',
)
def test_pathconf_negative_fd_uses_fd_semantics(self):
with self.assertRaises(OSError) as ctx:
os.pathconf(-1, 1)
self.assertEqual(ctx.exception.errno, errno.EBADF)

@unittest.skipUnless(hasattr(os, 'ftruncate'), 'test needs os.ftruncate()')
def test_ftruncate(self):
self.check(os.truncate, 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash in :func:`os.pathconf` when called with ``-1`` as the path
argument.
9 changes: 7 additions & 2 deletions Modules/posixmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,8 @@ get_posix_state(PyObject *module)
* Contains a file descriptor if path.accept_fd was true
* and the caller provided a signed integer instead of any
* sort of string.
* path.is_fd
* True if path was provided as a file descriptor.
*
* WARNING: if your "path" parameter is optional, and is
* unspecified, path_converter will never get called.
Expand Down Expand Up @@ -1332,6 +1334,7 @@ typedef struct {
const wchar_t *wide;
const char *narrow;
int fd;
bool is_fd;
int value_error;
Py_ssize_t length;
PyObject *object;
Expand All @@ -1341,7 +1344,7 @@ typedef struct {
#define PATH_T_INITIALIZE(function_name, argument_name, nullable, nonstrict, \
make_wide, suppress_value_error, allow_fd) \
{function_name, argument_name, nullable, nonstrict, make_wide, \
suppress_value_error, allow_fd, NULL, NULL, -1, 0, 0, NULL, NULL}
suppress_value_error, allow_fd, NULL, NULL, -1, false, 0, 0, NULL, NULL}
#ifdef MS_WINDOWS
#define PATH_T_INITIALIZE_P(function_name, argument_name, nullable, \
nonstrict, suppress_value_error, allow_fd) \
Expand Down Expand Up @@ -1475,6 +1478,7 @@ path_converter(PyObject *o, void *p)
}
path->wide = NULL;
path->narrow = NULL;
path->is_fd = true;
goto success_exit;
}
else {
Expand Down Expand Up @@ -14328,8 +14332,9 @@ os_pathconf_impl(PyObject *module, path_t *path, int name)

errno = 0;
#ifdef HAVE_FPATHCONF
if (path->fd != -1)
if (path->is_fd) {
limit = fpathconf(path->fd, name);
}
else
#endif
limit = pathconf(path->narrow, name);
Expand Down
Loading