Commit aded2e5e authored by Gregory P. Smith's avatar Gregory P. Smith

In the _hashlib module, only initialize the static data for OpenSSL's

constructors once, to avoid memory leaks when finalizing and re-initializing
the Python interpreter.
parent ce9e3c3a
...@@ -70,7 +70,7 @@ static PyTypeObject EVPtype; ...@@ -70,7 +70,7 @@ static PyTypeObject EVPtype;
#define DEFINE_CONSTS_FOR_NEW(Name) \ #define DEFINE_CONSTS_FOR_NEW(Name) \
static PyObject *CONST_ ## Name ## _name_obj; \ static PyObject *CONST_ ## Name ## _name_obj = NULL; \
static EVP_MD_CTX CONST_new_ ## Name ## _ctx; \ static EVP_MD_CTX CONST_new_ ## Name ## _ctx; \
static EVP_MD_CTX *CONST_new_ ## Name ## _ctx_p = NULL; static EVP_MD_CTX *CONST_new_ ## Name ## _ctx_p = NULL;
...@@ -587,12 +587,15 @@ generate_hash_name_list(void) ...@@ -587,12 +587,15 @@ generate_hash_name_list(void)
" hash object; optionally initialized with a string") \ " hash object; optionally initialized with a string") \
} }
/* used in the init function to setup a constructor */ /* used in the init function to setup a constructor: initialize OpenSSL
constructor constants if they haven't been initialized already. */
#define INIT_CONSTRUCTOR_CONSTANTS(NAME) do { \ #define INIT_CONSTRUCTOR_CONSTANTS(NAME) do { \
CONST_ ## NAME ## _name_obj = PyUnicode_FromString(#NAME); \ if (CONST_ ## NAME ## _name_obj == NULL) { \
if (EVP_get_digestbyname(#NAME)) { \ CONST_ ## NAME ## _name_obj = PyUnicode_FromString(#NAME); \
CONST_new_ ## NAME ## _ctx_p = &CONST_new_ ## NAME ## _ctx; \ if (EVP_get_digestbyname(#NAME)) { \
EVP_DigestInit(CONST_new_ ## NAME ## _ctx_p, EVP_get_digestbyname(#NAME)); \ CONST_new_ ## NAME ## _ctx_p = &CONST_new_ ## NAME ## _ctx; \
EVP_DigestInit(CONST_new_ ## NAME ## _ctx_p, EVP_get_digestbyname(#NAME)); \
} \
} \ } \
} while (0); } while (0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment