diff options
| author | Raimo Niskanen <[email protected]> | 2018-12-06 10:47:46 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-12-06 10:47:46 +0100 |
| commit | 63e436ae75584c885e4c66c08d5f33c68f67e69e (patch) | |
| tree | 5b0eced511bd433f64278183755fbdcab7f3269a /lib | |
| parent | cd4a7568315a50822fca79239ce04adbdc1774ae (diff) | |
| parent | 7c79f91fd5878c31c302015f5fc7fec51e4e7977 (diff) | |
| download | otp-63e436ae75584c885e4c66c08d5f33c68f67e69e.tar.gz otp-63e436ae75584c885e4c66c08d5f33c68f67e69e.tar.bz2 otp-63e436ae75584c885e4c66c08d5f33c68f67e69e.zip | |
Merge branch 'kenneth/asn1/ERIERL-278/OTP-15470' into maint
* 'kenneth/asn1/ERIERL-278/OTP-15470' of git-server:kenneth_otp:
Handle erroneous length during decode (BER only) without crashing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1/c_src/asn1_erl_nif.c | 2 | ||||
| -rw-r--r-- | lib/asn1/test/asn1_SUITE.erl | 16 |
2 files changed, 16 insertions, 2 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); diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl index 5506923341..ab78678110 100644 --- a/lib/asn1/test/asn1_SUITE.erl +++ b/lib/asn1/test/asn1_SUITE.erl @@ -63,7 +63,8 @@ groups() -> constraint_equivalence]}, {ber, Parallel, - [ber_choiceinseq, + [ber_decode_invalid_length, + ber_choiceinseq, % Uses 'SOpttest' ber_optional, tagdefault_automatic]}, @@ -665,6 +666,19 @@ module_test(M0, Config, Rule, Opts) -> end end. +ber_decode_invalid_length(_Config) -> + Bin = <<48,129,157,48,0,2,1,2,164,0,48,129,154,49,24,48,22,6, + 3,85,4,10,19,15,69,120,97,109,112,108,101,32,67,111, + 109,112,97,110,121,49,29,48,27,6,9,42,134,72,134,247, + 13,1,9,1,22,14,99,97,64,101,120,97,109,112,108,101,46, + 99,111,109,49,13,48,11,6,3,85,4,7,19,4,79,117,108,117, + 49,26,48,24,6,3,85,4,8,19,17,80,111,104,106,111,105, + 115,45,80,111,104,106,97,110,109,97,97,49,11,48,9,6,3, + 85,4,6,19,2,70,73,49,19,48,17,6,3,85,4,3,19,10,69,120, + 97,109,112,108,101,32,67,65,49,11,48,16,6,3,85,4,11, + 19,9,84,101>>, + {'EXIT',{error,{asn1,{invalid_value,12}}}} = (catch asn1rt_nif:decode_ber_tlv(Bin)), + ok. ber_choiceinseq(Config) -> test(Config, fun ber_choiceinseq/3, [ber]). |