diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2021-02-25 14:14:41 +0100 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2021-02-25 14:14:41 +0100 |
| commit | af06b432876f397a07c31ec3080b38f750202f24 (patch) | |
| tree | 54cf915f593df66bf1c1de0ded66747e3b0e14e6 | |
| parent | be2d1a0c406a43f33b921e2de5439fe6aa2a8f81 (diff) | |
| parent | a2e68350f0e90703bef1391fbcd04ecf95e9be6e (diff) | |
| download | erlang-af06b432876f397a07c31ec3080b38f750202f24.tar.gz | |
Merge branch 'sverker/erts/ets-rename-fix'
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index b325ad5bd3..fba40719e4 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -2126,15 +2126,10 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2) if (is_not_atom(BIF_ARG_2)) { + /* Do lookup to report bad table identifier or table name. */ DB_BIF_GET_TABLE(tb, DB_WRITE, LCK_READ, BIF_ets_rename_2); - if (tb == NULL) { - ASSERT(freason != TRAP); - /* Report bad table identifier or table name. */ - BIF_ERROR(BIF_P, freason); - } else { - db_unlock(tb, LCK_READ); - BIF_ERROR(BIF_P, BADARG); - } + db_unlock(tb, LCK_READ); + BIF_ERROR(BIF_P, BADARG); } (void) meta_name_tab_bucket(BIF_ARG_2, &lck1); |