From 3e9d91db52c3be046be13f2a5e6330a1509e30fc Mon Sep 17 00:00:00 2001 From: Simon Cornish Date: Tue, 14 Aug 2018 21:42:28 -0700 Subject: Test for lists that aren't well defined --- lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/erl_interface') diff --git a/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c b/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c index 1e986feacf..04e8ca322e 100644 --- a/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c +++ b/lib/erl_interface/test/erl_ext_SUITE_data/ext_test.c @@ -88,6 +88,11 @@ TESTCASE(compare_list) { // erlang:term_to_binary([0, 1000]) unsigned char term4[] = {131,108,0,0,0,2,97,0,98,0,0,3,232,106}; + // erlang:term_to_binary([a|b]) + unsigned char term5a[] = {131,108,0,0,0,1,100,0,1,97,100,0,1,98}; + // erlang:term_to_binary([a|c]) + unsigned char term5b[] = {131,108,0,0,0,1,100,0,1,97,100,0,1,99}; + erl_init(NULL, 0); start_a = term1; start_b = term2; @@ -103,6 +108,13 @@ TESTCASE(compare_list) { test_compare_ext("lists1", start_a, end_a, start_b, end_b, -1); + start_a = term5a; + start_b = term5b; + end_a = term5a + sizeof(term5a); + end_b = term5b + sizeof(term5b); + + test_compare_ext("lists5", start_a, end_a, start_b, end_b, -1); + report(1); } -- cgit v1.2.3 From 7f2efcc8cb3f104e6e3a53b18ce559842450b780 Mon Sep 17 00:00:00 2001 From: Simon Cornish Date: Tue, 14 Aug 2018 21:43:01 -0700 Subject: Fixed bug calling erl_compare_ext with terms containing lists The comparison did not consider the list tail and therefore would consider the following pairs of terms equal: {<<1,2,3>>, [901,902], 224} and {<<1,2,3>>, [901,902], 228} {a|b} and {a|c} --- lib/erl_interface/src/legacy/erl_marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/erl_interface') diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c index c18067b9bc..932bba43bf 100644 --- a/lib/erl_interface/src/legacy/erl_marshal.c +++ b/lib/erl_interface/src/legacy/erl_marshal.c @@ -1803,7 +1803,7 @@ static int cmp_exe2(unsigned char **e1, unsigned char **e2) k = 0; while (1) { if (k++ == min){ - if (i == j) return 0; + if (i == j) return compare_top_ext(e1 , e2); if (i < j) return -1; return 1; } -- cgit v1.2.3