diff options
| author | John Högberg <[email protected]> | 2018-03-12 11:38:30 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-03-12 11:38:30 +0100 |
| commit | 2960c7d08932b718dc93773e0718cd214277e09d (patch) | |
| tree | 93e755c0f61d3ba73fe0d3c866e23355a82059ca /erts/emulator/beam/erl_db.c | |
| parent | 0217dbfee505ed8c88164c7a4ea5e1834e6ce8cd (diff) | |
| parent | 4d4629605ab7d3c3a5268502dadcf639151d6c42 (diff) | |
| download | otp-2960c7d08932b718dc93773e0718cd214277e09d.tar.gz otp-2960c7d08932b718dc93773e0718cd214277e09d.tar.bz2 otp-2960c7d08932b718dc93773e0718cd214277e09d.zip | |
Merge branch 'john/erts/assert-on-memcpy-memset-etc'
* john/erts/assert-on-memcpy-memset-etc:
Always use sys_memcpy/cmp/etc instead of plain memcpy/cmp/etc
Check the arguments to sys_memcpy and friends
Diffstat (limited to 'erts/emulator/beam/erl_db.c')
| -rw-r--r-- | erts/emulator/beam/erl_db.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c index 1ab1c4a363..a76d769283 100644 --- a/erts/emulator/beam/erl_db.c +++ b/erts/emulator/beam/erl_db.c @@ -4261,7 +4261,7 @@ erts_ets_colliding_names(Process* p, Eterm name, Uint cnt) while (index >= atom_table_size()) { char tmp[20]; erts_snprintf(tmp, sizeof(tmp), "am%x", atom_table_size()); - erts_atom_put((byte *) tmp, strlen(tmp), ERTS_ATOM_ENC_LATIN1, 1); + erts_atom_put((byte *) tmp, sys_strlen(tmp), ERTS_ATOM_ENC_LATIN1, 1); } list = CONS(hp, make_atom(index), list); hp += 2; |