From: Eclips4 <80244920+Eclips4@users.noreply.github.com>
Date: Thu, 16 Feb 2023 17:46:43 +0000 (+0300)
Subject: gh-101952: Fix possible segfault in `BUILD_SET` opcode (#101958)
X-Git-Tag: v3.12.0a6~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68bd8c5e2efab64ff9d38a214775164182179431;p=thirdparty%2FPython%2Fcpython.git

gh-101952: Fix possible segfault in `BUILD_SET` opcode (#101958)
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-02-16-16-57-23.gh-issue-101952.Zo1dlq.rst b/Misc/NEWS.d/next/Core and Builtins/2023-02-16-16-57-23.gh-issue-101952.Zo1dlq.rst
new file mode 100644
index 000000000000..3902c988c8bf
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-02-16-16-57-23.gh-issue-101952.Zo1dlq.rst	
@@ -0,0 +1 @@
+Fix possible segfault in ``BUILD_SET`` opcode, when new set created.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index d5d5034cbfbf..84747f1758e0 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -1302,6 +1302,8 @@ dummy_func(
 
         inst(BUILD_SET, (values[oparg] -- set)) {
             set = PySet_New(NULL);
+            if (set == NULL)
+                goto error;
             int err = 0;
             for (int i = 0; i < oparg; i++) {
                 PyObject *item = values[i];
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 8b8a7161ad89..730dfb7426ac 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -1649,6 +1649,8 @@
             PyObject **values = &PEEK(oparg);
             PyObject *set;
             set = PySet_New(NULL);
+            if (set == NULL)
+                goto error;
             int err = 0;
             for (int i = 0; i < oparg; i++) {
                 PyObject *item = values[i];