diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-20 19:11:33 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-20 19:11:33 +0100 |
| commit | e55df241937d62ec15fedac4a9aa4c4c34fddee5 (patch) | |
| tree | 2da5aa37f0598f24c5cf3185c4b21a1e2371075a /erts | |
| parent | 91dcab3cf054d43626164a626274f69280792c79 (diff) | |
| parent | 54ac9157e121175615485f89dbf90fc645435d17 (diff) | |
| download | otp-e55df241937d62ec15fedac4a9aa4c4c34fddee5.tar.gz otp-e55df241937d62ec15fedac4a9aa4c4c34fddee5.tar.bz2 otp-e55df241937d62ec15fedac4a9aa4c4c34fddee5.zip | |
Merge PR-1716 from sverker/slash-in-modules/ERL-564/OTP-14933
Reject loading modules with slash in name
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 54872 -> 54832 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex af6facb5f2..31372a3fab 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl index 1d09aeded9..11d63c93e3 100644 --- a/erts/preloaded/src/erl_prim_loader.erl +++ b/erts/preloaded/src/erl_prim_loader.erl @@ -56,7 +56,7 @@ -export([purge_archive_cache/0]). %% Used by init and the code server. --export([get_modules/2,get_modules/3]). +-export([get_modules/2,get_modules/3, is_basename/1]). -include_lib("kernel/include/file.hrl"). |