diff options
| author | Hans Nilsson <[email protected]> | 2018-12-03 10:21:37 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-12-03 10:21:37 +0100 |
| commit | cd7a8c3feaeb500ba7d80129a19693edc0a54776 (patch) | |
| tree | 2c60279268994cf90edde9616374a59384d4b03f /lib/crypto/src | |
| parent | c85094dddfa54bb3991d7ba6147ef177c0dd9c42 (diff) | |
| parent | a86d641607b7b5ba0be455725b33ded0a5470509 (diff) | |
| download | otp-cd7a8c3feaeb500ba7d80129a19693edc0a54776.tar.gz otp-cd7a8c3feaeb500ba7d80129a19693edc0a54776.tar.bz2 otp-cd7a8c3feaeb500ba7d80129a19693edc0a54776.zip | |
Merge branch 'maint'
* maint:
crypto: Engine valgrind fix
crypto: Fix valgrind error in dh_generate/dh_compute
crypto: Fix valgrind errors in pkey_crypt_nif
crypto: Add some crypto:engine_unload in engine test suite
crypto: Fix valgrind errors in privkey_to_pubkey
crypto: Fix valgrind error for keys with passwords in Engines
Diffstat (limited to 'lib/crypto/src')
| -rw-r--r-- | lib/crypto/src/crypto.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index feb02d0f5a..6836e30a1b 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -1351,7 +1351,11 @@ engine_load_1(Engine, PreCmds, PostCmds, EngineMethods) -> throw:Error -> %% The engine couldn't initialise, release the structural reference ok = engine_free_nif(Engine), - throw(Error) + throw(Error); + error:badarg -> + %% For example bad argument list, release the structural reference + ok = engine_free_nif(Engine), + error(badarg) end. engine_load_2(Engine, PostCmds, EngineMethods) -> |