aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-09-17 11:28:10 +0200
committerJohn Högberg <[email protected]>2018-09-17 11:28:10 +0200
commit3a33f5ffe2d130789a7ebc45df75dbb56988016e (patch)
tree29d220227d4bc989ac818fbf9a68fa351534246a /erts/preloaded
parent01cb61c5dc84bd64acfdfb69f1b072d026cfa114 (diff)
parent6f5a0d5f83668d4b53fcce9a6c927e30df169765 (diff)
downloadotp-3a33f5ffe2d130789a7ebc45df75dbb56988016e.tar.gz
otp-3a33f5ffe2d130789a7ebc45df75dbb56988016e.tar.bz2
otp-3a33f5ffe2d130789a7ebc45df75dbb56988016e.zip
Merge branch 'john/erts/improve-list-reverse-trapping/OTP-15199' into maint
* john/erts/improve-list-reverse-trapping/OTP-15199: Improve trapping in lists:reverse/2 Fix unsafe use of lists:reverse/1
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/prim_file.beambin27800 -> 27780 bytes
-rw-r--r--erts/preloaded/src/prim_file.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 3316e4348c..df611f2bb0 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 517ca74301..6d85868183 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -786,7 +786,7 @@ altname_nif(_Path) ->
%% We know for certain that lists:reverse/2 is a BIF, so it's safe to use it
%% even though this module is preloaded.
-reverse_list(List) -> lists:reverse(List).
+reverse_list(List) -> lists:reverse(List, []).
proplist_get_value(_Key, [], Default) ->
Default;