From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 Sep 2017 03:19:12 +0000 (-0700)
Subject: correct initialization code (#3376)
X-Git-Tag: v3.7.0a1~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0a9a5a6a4786a6f8f0540e243427775d8ca245e;p=python

correct initialization code (#3376)

Explicitly initialize struct members rather than relying on compiler extensions.
---

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index f33e920e6b..3f405b1225 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -77,7 +77,7 @@ extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
 extern void _PyGILState_Fini(void);
 #endif /* WITH_THREAD */
 
-_PyRuntimeState _PyRuntime = {};
+_PyRuntimeState _PyRuntime = {0, 0};
 
 void
 _PyRuntime_Initialize(void)
diff --git a/Python/pystate.c b/Python/pystate.c
index 3d3207702f..2d926372fd 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -37,8 +37,7 @@ extern "C" {
 void
 _PyRuntimeState_Init(_PyRuntimeState *runtime)
 {
-    _PyRuntimeState initial = {};
-    *runtime = initial;
+    memset(runtime, 0, sizeof(*runtime));
 
     _PyObject_Initialize(&runtime->obj);
     _PyMem_Initialize(&runtime->mem);