diff options
| author | Michael Demeter <michael.demeter@intel.com> | 2014-01-06 15:47:34 -0800 |
|---|---|---|
| committer | Michael Demeter <michael.demeter@intel.com> | 2014-01-06 15:47:34 -0800 |
| commit | 975084c3fdbacd5f8a3c626171be8d4df27b2ac5 (patch) | |
| tree | 7f18b115ac927b799ebfe55335282130047b3ec6 /crypto/ecdsa/ecs_lib.c | |
| parent | 37a8d409f8ffc065c1b1417f0f3b5ba050e8aa95 (diff) | |
| download | openssl-975084c3fdbacd5f8a3c626171be8d4df27b2ac5.tar.gz openssl-975084c3fdbacd5f8a3c626171be8d4df27b2ac5.tar.bz2 openssl-975084c3fdbacd5f8a3c626171be8d4df27b2ac5.zip | |
Imported Upstream version 1.0.1fupstream/1.0.1f
Diffstat (limited to 'crypto/ecdsa/ecs_lib.c')
| -rw-r--r-- | crypto/ecdsa/ecs_lib.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crypto/ecdsa/ecs_lib.c b/crypto/ecdsa/ecs_lib.c index e477da4..814a6bf 100644 --- a/crypto/ecdsa/ecs_lib.c +++ b/crypto/ecdsa/ecs_lib.c @@ -200,8 +200,15 @@ ECDSA_DATA *ecdsa_check(EC_KEY *key) ecdsa_data = (ECDSA_DATA *)ecdsa_data_new(); if (ecdsa_data == NULL) return NULL; - EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, - ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); + data = EC_KEY_insert_key_method_data(key, (void *)ecdsa_data, + ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free); + if (data != NULL) + { + /* Another thread raced us to install the key_method + * data and won. */ + ecdsa_data_free(ecdsa_data); + ecdsa_data = (ECDSA_DATA *)data; + } } else ecdsa_data = (ECDSA_DATA *)data; |