Merge 'sverker/26/ets_fix_update_badarg/OTP-19962'

into 'sverker/27/ets_fix_update_badarg/OTP-19962'

Author: sverker

erts/emulator/beam/erl_db.c

@@ -1641,7 +1641,8 @@ BIF_RETTYPE ets_update_counter_4(BIF_ALIST_4)
 
     DB_BIF_GET_TABLE(tb, DB_WRITE, LCK_WRITE_REC, BIF_ets_update_counter_4);
 
-    if (is_not_tuple(BIF_ARG_4)) {
+    if (is_not_tuple(BIF_ARG_4)
+	|| arityval(*tuple_val(BIF_ARG_4)) < tb->common.keypos) {
         db_unlock(tb, LCK_WRITE_REC);
         BIF_ERROR(BIF_P, BADARG);
     }

lib/stdlib/test/ets_SUITE.erl

@@ -66,7 +66,8 @@
          fixtable_insert/1, rename/1, rename_unnamed/1, evil_rename/1,
 	 update_element/1, update_element_default/1, update_counter/1, evil_update_counter/1, partly_bound/1, match_heavy/1]).
 -export([update_counter_with_default/1]).
--export([update_counter_with_default_bad_pos/1]).
+-export([update_counter_with_default_bad_pos/1,
+	 update_counter_with_default_bad_default/1]).
 -export([update_counter_table_growth/1]).
 -export([member/1]).
 -export([memory/1]).
@@ -156,6 +157,7 @@ all() ->
      update_counter, evil_update_counter,
      update_counter_with_default,
      update_counter_with_default_bad_pos,
+     update_counter_with_default_bad_default,
      partly_bound,
      update_counter_table_growth,
      match_heavy, {group, fold}, member, t_delete_object,
@@ -3070,6 +3072,20 @@ update_counter_with_default_bad_pos_do(Opts) ->
     0 = ets:info(T, size),
     ok.
 
+update_counter_with_default_bad_default(Config) when is_list(Config) ->
+    repeat_for_opts_all_table_types(fun update_counter_with_default_bad_default_do/1).
+
+update_counter_with_default_bad_default_do(Opts) ->
+    T = ets_new(a, [{keypos, 3} | Opts]),
+    0 = ets:info(T, size),
+    ok = try ets:update_counter(T, 0, {2, 1}, {0, 0})
+	 catch
+	     error:badarg -> ok;
+	     Class:Reason -> {Class, Reason}
+	 end,
+    0 = ets:info(T, size),
+    ok.
+
 update_counter_table_growth(_Config) ->
     repeat_for_opts(fun update_counter_table_growth_do/1).