Commit 6982c0da authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

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.
parent b7727ee6

crypto/engine/engine_list.c

+4 −4
Original line number Diff line number Diff line
@@ -451,10 +451,10 @@ static int ENGINE_free_nolock(ENGINE *e) 
int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,

		CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)

	{

	engine_ex_data_num++;

	return(CRYPTO_get_ex_new_index(engine_ex_data_num - 1,

			&engine_ex_data_stack, argl, argp,

			new_func, dup_func, free_func));

	if(CRYPTO_get_ex_new_index(engine_ex_data_num, &engine_ex_data_stack,

			argl, argp, new_func, dup_func, free_func) < 0)

		return -1;

	return (engine_ex_data_num++);

	}



int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg)