diff options
| author | Erlang/OTP <[email protected]> | 2018-12-06 12:56:37 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-12-06 12:56:37 +0100 |
| commit | 270b9377ff1ef3f8822bf1697c6aa1972f27be18 (patch) | |
| tree | 706cc86536294b5894f9008d8d1f7d81444478a4 /lib/asn1/c_src | |
| parent | 166aa12d68c71814ad3a06345bec57fa78a4b7de (diff) | |
| parent | 7b07f479377139cb67ceaab03afa76a32325f9e9 (diff) | |
| download | otp-270b9377ff1ef3f8822bf1697c6aa1972f27be18.tar.gz otp-270b9377ff1ef3f8822bf1697c6aa1972f27be18.tar.bz2 otp-270b9377ff1ef3f8822bf1697c6aa1972f27be18.zip | |
Merge branch 'henrik/ERIERL-278/OTP-15470' into maint-20
* henrik/ERIERL-278/OTP-15470:
Handle erroneous length during decode (BER only) without crashing
Diffstat (limited to 'lib/asn1/c_src')
| -rw-r--r-- | lib/asn1/c_src/asn1_erl_nif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/c_src/asn1_erl_nif.c b/lib/asn1/c_src/asn1_erl_nif.c index 797be6d4f8..da43af3405 100644 --- a/lib/asn1/c_src/asn1_erl_nif.c +++ b/lib/asn1/c_src/asn1_erl_nif.c @@ -999,7 +999,7 @@ static int ber_decode_value(ErlNifEnv* env, ERL_NIF_TERM *value, unsigned char * while (*ib_index < end_index) { if ((maybe_ret = ber_decode(env, &term, in_buf, ib_index, - *ib_index + len)) <= ASN1_ERROR + end_index )) <= ASN1_ERROR ) return maybe_ret; curr_head = enif_make_list_cell(env, term, curr_head); |