diff options
| author | Björn Gustavsson <[email protected]> | 2016-05-18 10:03:01 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-05-18 10:03:01 +0200 |
| commit | eed258eb615c1743f4630329abf96986ffaf28e8 (patch) | |
| tree | b966a3dfc6728cf166917d44ee22df9241cb0fc4 /erts | |
| parent | b78057cdd586f105a2b265b35fc9119538d84388 (diff) | |
| parent | cc59f962511733c5dfcb1be27a274f9298736006 (diff) | |
| download | otp-eed258eb615c1743f4630329abf96986ffaf28e8.tar.gz otp-eed258eb615c1743f4630329abf96986ffaf28e8.tar.bz2 otp-eed258eb615c1743f4630329abf96986ffaf28e8.zip | |
Merge branch 'bjorn/handle-bad-path/ERL-142'
* bjorn/handle-bad-path/ERL-142:
Tolerate bad directories in the code path
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 55780 -> 55732 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 6 |
2 files changed, 2 insertions, 4 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex de2693472a..66e443f396 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 e18e187cb7..b3ec73a60e 100644 --- a/erts/preloaded/src/erl_prim_loader.erl +++ b/erts/preloaded/src/erl_prim_loader.erl @@ -558,11 +558,9 @@ efile_gm_get_1([P|Ps], File0, Mod, {Parent,Ref}=PR, Process) -> Res = try prim_file:read_file(File) of {ok,Bin} -> gm_process(Mod, File, Bin, Process); - {error,enoent} -> - efile_gm_get_1(Ps, File0, Mod, PR, Process); Error -> - check_file_result(get_modules, File, Error), - Error + _ = check_file_result(get_modules, File, Error), + efile_gm_get_1(Ps, File0, Mod, PR, Process) catch _:Reason -> {error,{crash,Reason}} |