summaryrefslogtreecommitdiffstats
path: root/crypto/x509
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2001-08-12 16:52:00 +0000
committerGeoff Thorpe <geoff@openssl.org>2001-08-12 16:52:00 +0000
commitb7727ee616a3351a001497dda077ec63330861db (patch)
treecfb5ada448b2a405e2b7b3967a48ba61f690d9aa /crypto/x509
parentf0446ca8d746ff138a892588e33597411f59f5fa (diff)
The indexes returned by ***_get_ex_new_index() functions are used when
setting stack (actually, array) values in ex_data. So only increment the global counters if the underlying CRYPTO_get_ex_new_index() call succeeds. This change doesn't make "ex_data" right (see the comment at the head of ex_data.c to know why), but at least makes the source code marginally less frustrating.
Diffstat (limited to 'crypto/x509')
-rw-r--r--crypto/x509/x509_vfy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 0b9ae12a6f..4c3aae73a9 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -895,10 +895,10 @@ int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_fu
* That function uses locking, so we don't (usually)
* have to worry about locking here. For the whole cruel
* truth, see crypto/ex_data.c */
- x509_store_ctx_num++;
- return CRYPTO_get_ex_new_index(x509_store_ctx_num-1,
- &x509_store_ctx_method,
- argl,argp,new_func,dup_func,free_func);
+ if(CRYPTO_get_ex_new_index(x509_store_ctx_num, &x509_store_ctx_method,
+ argl, argp, new_func, dup_func, free_func) < 0)
+ return -1;
+ return (x509_store_ctx_num++);
}
int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data)