diff options
author | Sverker Eriksson <[email protected]> | 2018-10-09 13:14:09 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2018-10-09 13:14:09 +0200 |
commit | f4f409ff28185b3308359ca5ca91921bc51f536f (patch) | |
tree | 9a5a431baf824be729f6eb2b31ba0700247b07f8 /lib/stdlib/test/ets_SUITE.erl | |
parent | 5e4083353479ed3d5c3628c46dad9e32883243dc (diff) | |
parent | 8018680cc1977ac2d70c070a5761cfe2db914821 (diff) | |
download | otp-f4f409ff28185b3308359ca5ca91921bc51f536f.tar.gz otp-f4f409ff28185b3308359ca5ca91921bc51f536f.tar.bz2 otp-f4f409ff28185b3308359ca5ca91921bc51f536f.zip |
Merge branch 'maint'
# Conflicts:
# erts/emulator/beam/erl_db_tree.c
Diffstat (limited to 'lib/stdlib/test/ets_SUITE.erl')
-rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index 0014793588..2c0692855f 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -41,7 +41,7 @@ -export([t_delete_object/1, t_init_table/1, t_whitebox/1, select_bound_chunk/1, t_delete_all_objects/1, t_insert_list/1, t_test_ms/1, - t_select_delete/1,t_select_replace/1,t_ets_dets/1]). + t_select_delete/1,t_select_replace/1,t_select_replace_next_bug/1,t_ets_dets/1]). -export([ordered/1, ordered_match/1, interface_equality/1, fixtable_next/1, fixtable_insert/1, rename/1, rename_unnamed/1, evil_rename/1, @@ -126,6 +126,7 @@ all() -> select_bound_chunk, t_init_table, t_whitebox, t_delete_all_objects, t_insert_list, t_test_ms, t_select_delete, t_select_replace, + t_select_replace_next_bug, t_ets_dets, memory, t_select_reverse, t_bucket_disappears, t_named_select, select_fail, t_insert_new, t_repair_continuation, @@ -1471,6 +1472,25 @@ t_select_replace(Config) when is_list(Config) -> verify_etsmem(EtsMem). +%% OTP-15346: Bug caused select_replace of bound key to corrupt static stack +%% used by ets:next and ets:prev. +t_select_replace_next_bug(Config) when is_list(Config) -> + T = ets:new(k, [ordered_set]), + [ets:insert(T, {I, value}) || I <- lists:seq(1,10)], + 1 = ets:first(T), + + %% Make sure select_replace does not leave pointer + %% to deallocated {2,value} in static stack. + MS = [{{2,value}, [], [{{2,"new_value"}}]}], + 1 = ets:select_replace(T, MS), + + %% This would crash or give wrong result at least on DEBUG emulator + %% where deallocated memory is overwritten. + 2 = ets:next(T, 1), + + ets:delete(T). + + %% Test that partly bound keys gives faster matches. partly_bound(Config) when is_list(Config) -> case os:type() of |