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_goodfit_alloc.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_goodfit_alloc.c')
-rw-r--r-- | erts/emulator/beam/erl_goodfit_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c index a38f6c7daf..e3ba67f0af 100644 --- a/erts/emulator/beam/erl_goodfit_alloc.c +++ b/erts/emulator/beam/erl_goodfit_alloc.c @@ -508,7 +508,7 @@ static struct { static void ERTS_INLINE atom_init(Eterm *atom, char *name) { - *atom = am_atom_put(name, strlen(name)); + *atom = am_atom_put(name, sys_strlen(name)); } #define AM_INIT(AM) atom_init(&am.AM, #AM) |