-
-
Notifications
You must be signed in to change notification settings - Fork 30.9k
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.
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
bpo-1635741: Fix refleaks of timemoudle in PyInit_time() #18486
Conversation
cc @brandtbucher |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your work on this! Looks good, just one question below:
} | ||
|
||
#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_CLOCK_SETTIME) || defined(HAVE_CLOCK_GETRES) | ||
|
||
#ifdef CLOCK_REALTIME | ||
PyModule_AddIntMacro(m, CLOCK_REALTIME); | ||
if (PyModule_AddIntMacro(m, CLOCK_REALTIME) < 0) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the reason that you need goto
in every one of these blocks that PyErr_Occcurred()
will get reset if you make other PyModule_AddIntMacro
calls that don't fail along the way?
Either way, I'm mildly tempted to suggest adding a wrapper macro like:
#define _PyModule_AddIntMacroOrGotoError(m, macro) \
if (PyModule_AddIntMacro(m, macro) < 0) { goto error; }
But I dunno. I'm torn between the principles of "don't repeat yourself" and "don't write a preprocessor macro with a goto in it (you monster)".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Between the two options, I'm personally +0 on repetition. Incorrect error handling for the whole PyModule_Add
family of functions is rampant in the stdlib (see my work in bpo-38823), and I think reinforcing the correct usage is good to have to keep people from repeating the same old patterns (especially in outside projects).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the reason that you need goto in every one of these blocks that PyErr_Occcurred() will get reset if you make other PyModule_AddIntMacro calls that don't fail along the way?
No, I just try to make the Py_DECREF(m);return NULL;
looks like a common processing item.
I think reinforcing the correct usage is good to have to keep people from repeating the same old patterns
+1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dislike macros hiding a goto. A goto statement is dangerous, I prefer to make it explicit. The "if (...) { goto error; }" is a very common pattern in Python, especially in initialization code.
Thanks @shihai1991, I merged your PR. |
https://bugs.python.org/issue1635741