From: Christian Heimes <christian@python.org>
Date: Tue, 13 Sep 2016 18:48:13 +0000 (+0200)
Subject: Issue #28188: Use PyMem_Calloc() to get rid of a type-limits warning and an extra... 
X-Git-Tag: v3.6.0b2~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6365e381620d95a112720d9f18ab6137882ecca;p=python

Issue #28188: Use PyMem_Calloc() to get rid of a type-limits warning and an extra memset() call in _ssl.c.
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index b32d1c1756..fc7a989a8d 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -5073,13 +5073,12 @@ static int _setup_ssl_threads(void) {
 
     if (_ssl_locks == NULL) {
         _ssl_locks_count = CRYPTO_num_locks();
-        _ssl_locks = PyMem_New(PyThread_type_lock, _ssl_locks_count);
+        _ssl_locks = PyMem_Calloc(_ssl_locks_count,
+                                  sizeof(PyThread_type_lock));
         if (_ssl_locks == NULL) {
             PyErr_NoMemory();
             return 0;
         }
-        memset(_ssl_locks, 0,
-               sizeof(PyThread_type_lock) * _ssl_locks_count);
         for (i = 0;  i < _ssl_locks_count;  i++) {
             _ssl_locks[i] = PyThread_allocate_lock();
             if (_ssl_locks[i] == NULL) {