Skip to content

pull PyCapsule_New() into the PYLOCK() section in poll_func() #83

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

Merged
sdelafond merged 2 commits into from
Nov 14, 2024
+24 −3
Merged

pull PyCapsule_New() into the PYLOCK() section in poll_func() #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92bf471
Check the return value of PyCapsule_New()
Nov 13, 2024
26ee2c9
pull PyCapsule_New() into the PYLOCK() section in poll_func()
Nov 13, 2024
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
27 changes: 24 additions & 3 deletions fuseparts/_fusemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,15 +1272,36 @@ poll_func(const char *path, struct fuse_file_info *fi,
struct fuse_pollhandle *ph, unsigned *reventsp)
{
PyObject *pollhandle = Py_None;
int ret = -EINVAL;
PyObject *v;

if (ph)
PYLOCK();

if (ph) {
pollhandle = PyCapsule_New(ph, pollhandle_name, pollhandle_destructor);
if (!pollhandle) {
PyErr_Print();
goto OUT;
}
}

#ifdef FIX_PATH_DECODING
PROLOGUE(PYO_CALLWITHFI(fi, poll_cb, O&O, &Path_AsDecodedUnicode, path, pollhandle));
v = PYO_CALLWITHFI(fi, poll_cb, O&O, &Path_AsDecodedUnicode, path, pollhandle);
#else
PROLOGUE(PYO_CALLWITHFI(fi, poll_cb, sO, path, pollhandle));
v = PYO_CALLWITHFI(fi, poll_cb, sO, path, pollhandle);
#endif
if (!v) {
PyErr_Print();
goto OUT;
}
if (v == Py_None) {
ret = 0;
goto OUT_DECREF;
}
if (PyInt_Check(v)) {
ret = PyInt_AsLong(v);
goto OUT_DECREF;
}

OUT_DECREF:
Py_DECREF(v);
Expand Down
Loading