Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-124044: protect macros expansions in _cursesmodule.c using do { ... } while (0) constructions #124045

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
merged 4 commits into from
Sep 13, 2024
Merged

gh-124044: protect macros expansions in _cursesmodule.c using do { ... } while (0) constructions #124045

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abcb191
protect `PyCursesSetupTermCalled` macro expansion
picnixz Sep 13, 2024
b0bbb71
protect `PyCursesInitialised` macro expansion
picnixz Sep 13, 2024
2af35b3
add missing semi-colons
picnixz Sep 13, 2024
d806ef9
protect `PyCursesInitialisedColor` macro expansion
picnixz Sep 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
47 changes: 28 additions & 19 deletions Modules/_cursesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,22 +182,31 @@ static char *screen_encoding = NULL;

/* Utility Macros */
#define PyCursesSetupTermCalled \
if (initialised_setupterm != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call (at least) setupterm() first"); \
return 0; }
do { \
if (initialised_setupterm != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call (at least) setupterm() first"); \
return 0; \
} \
} while (0)

#define PyCursesInitialised \
if (initialised != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call initscr() first"); \
return 0; }
#define PyCursesInitialised \
do { \
if (initialised != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call initscr() first"); \
return 0; \
} \
} while (0)

#define PyCursesInitialisedColor \
if (initialisedcolors != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call start_color() first"); \
return 0; }
do { \
if (initialisedcolors != TRUE) { \
PyErr_SetString(PyCursesError, \
"must call start_color() first"); \
return 0; \
} \
} while (0)

/* Utility Functions */

Expand Down Expand Up @@ -2633,12 +2642,12 @@ PyTypeObject PyCursesWindow_Type = {

#define NoArgNoReturnFunctionBody(X) \
{ \
PyCursesInitialised \
PyCursesInitialised; \
return PyCursesCheckERR(X(), # X); }

#define NoArgOrFlagNoReturnFunctionBody(X, flag) \
{ \
PyCursesInitialised \
PyCursesInitialised; \
if (flag) \
return PyCursesCheckERR(X(), # X); \
else \
Expand All @@ -2647,23 +2656,23 @@ PyTypeObject PyCursesWindow_Type = {

#define NoArgReturnIntFunctionBody(X) \
{ \
PyCursesInitialised \
PyCursesInitialised; \
return PyLong_FromLong((long) X()); }


#define NoArgReturnStringFunctionBody(X) \
{ \
PyCursesInitialised \
PyCursesInitialised; \
return PyBytes_FromString(X()); }

#define NoArgTrueFalseFunctionBody(X) \
{ \
PyCursesInitialised \
PyCursesInitialised; \
return PyBool_FromLong(X()); }

#define NoArgNoReturnVoidFunctionBody(X) \
{ \
PyCursesInitialised \
PyCursesInitialised; \
X(); \
Py_RETURN_NONE; }

Expand Down
Loading