gh-121617: Fix Py_CLEAR() in C++: replace NULL with _Py_NULL by vstinner · Pull Request #157067 · python/cpython · GitHub
Skip to content

gh-121617: Fix Py_CLEAR() in C++: replace NULL with _Py_NULL #157067

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
vstinner merged 1 commit into from
Sep 8, 2026
+27 −3
Merged

gh-121617: Fix Py_CLEAR() in C++: replace NULL with _Py_NULL #157067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion Include/refcount.h
View file
Open in desktop
12 changes: 10 additions & 2 deletions Lib/test/test_cext/extension.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,17 @@ _testcext_exec(PyObject *module)
Py_BUILD_ASSERT(sizeof(int) == sizeof(unsigned int));
assert(Py_BUILD_ASSERT_EXPR(sizeof(int) == sizeof(unsigned int)) == 0);

// Test Py_CLEAR()
obj = NULL;
// Test Py_CLEAR(): use typeof()/__typeof__() if available, or memcpy()
obj = Py_None;
Py_CLEAR(obj);
assert(obj == NULL);

#ifndef Py_LIMITED_API
// Test Py_SETREF(): use typeof()/__typeof__() if available, or memcpy()
obj = Py_None;
Py_SETREF(obj, NULL);
assert(obj == NULL);
#endif

// Test that Py_BEGIN_CRITICAL_SECTION is available
Py_BEGIN_CRITICAL_SECTION(module);
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_cppext/extension.cpp
View file
Open in desktop
Loading