summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update httpc.xmlIngelaAndin-httpc-typoIngela Andin2021-09-031-1/+1
| | | Fix typo
* Merge branch 'maint-24' into maintBjörn Gustavsson2021-09-035-2/+60
|\ | | | | | | | | | | | | | | | | * maint-24: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
| * Updated OTP versionOTP-24.0.6Erlang/OTP2021-09-022-1/+2
| |
| * Prepare releaseErlang/OTP2021-09-023-2/+58
| |
| * Merge branch 'bjorn/erts/fix-map-decoding/OTP-17594' into maint-24Erlang/OTP2021-09-022-1/+20
| |\ | | | | | | | | | | | | * bjorn/erts/fix-map-decoding/OTP-17594: Make binary_to_term/1 more resilent against bad binaries
| * \ Merge branch 'lukas/erts/fix-convert-subbin-bugs/OTP-17585' into maint-24Erlang/OTP2021-09-021-2/+5
| |\ \ | | | | | | | | | | | | | | | | * lukas/erts/fix-convert-subbin-bugs/OTP-17585: erts: Make re copy small subbinaries
| * \ \ Merge branch 'lukas/erts/fix-erl_tracer-use-after-free/PR-4940/OTP-17568' ↵Erlang/OTP2021-09-026-14/+63
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint-24 * lukas/erts/fix-erl_tracer-use-after-free/PR-4940/OTP-17568: erts: Fix use after free for ErtsTracerNif* # Conflicts: # erts/emulator/beam/erl_nif.c # erts/emulator/test/dirty_nif_SUITE.erl # erts/emulator/test/gc_SUITE.erl
| * \ \ \ Merge branch ↵Erlang/OTP2021-09-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lukas/erts/fix-ttysl-memcpy-buffer-overwrite/GH-5116/OTP-17560' into maint-24 * lukas/erts/fix-ttysl-memcpy-buffer-overwrite/GH-5116/OTP-17560: erts: Fix memcpy buffer overwrite
| * \ \ \ \ Merge branch 'max-au/fix-pi-lockup/OTP-17548' into maint-24Erlang/OTP2021-09-023-6/+77
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * max-au/fix-pi-lockup/OTP-17548: Fix process_info that can hang waiting for reply
| * \ \ \ \ \ Merge branch 'lukas/add-github-actions' into maint-24Erlang/OTP2021-09-021-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/add-github-actions: gh-actions: Pin debian version to bullseye gh-actions: Fix libaspell crossenv install Backport github dockerfile changes bf48282 and e4c3fcf # Conflicts: # .github/dockerfiles/Dockerfile.debian-base
* | \ \ \ \ \ \ Merge branch 'maint-23' into maintBjörn Gustavsson2021-09-033-0/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-23: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/vsn.mk # make/otp_version_tickets # otp_versions.table
| * | | | | | | | Updated OTP versionOTP-23.3.4.6Erlang/OTP2021-09-022-1/+2
| | | | | | | | |
| * | | | | | | | Prepare releaseErlang/OTP2021-09-025-12/+65
| | | | | | | | |
| * | | | | | | | Merge branch 'bjorn/erts/fix-map-decoding/OTP-17594' into maint-23Erlang/OTP2021-09-022-1/+20
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | * bjorn/erts/fix-map-decoding/OTP-17594: Make binary_to_term/1 more resilent against bad binaries
| * | | | | | | | Merge branch 'lukas/erts/fix-convert-subbin-bugs/OTP-17585' into maint-23Erlang/OTP2021-09-021-2/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | * lukas/erts/fix-convert-subbin-bugs/OTP-17585: erts: Make re copy small subbinaries
| * | | | | | | | Merge branch ↵Erlang/OTP2021-09-021-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lukas/kernel/fix-code-get_doc-escript/ERL-1261/GH-4256/OTP-17570' into maint-23 * lukas/kernel/fix-code-get_doc-escript/ERL-1261/GH-4256/OTP-17570: kernel: Do not crash when getting doc from escript
| * \ \ \ \ \ \ \ \ Merge branch 'lukas/erts/fix-erl_tracer-use-after-free/PR-4940/OTP-17568' ↵Erlang/OTP2021-09-026-14/+63
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint-23 * lukas/erts/fix-erl_tracer-use-after-free/PR-4940/OTP-17568: erts: Fix use after free for ErtsTracerNif* # Conflicts: # erts/emulator/test/dirty_nif_SUITE.erl # erts/emulator/test/gc_SUITE.erl
| * | | | | | | | | Merge branch ↵Erlang/OTP2021-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lukas/erts/fix-ttysl-memcpy-buffer-overwrite/GH-5116/OTP-17560' into maint-23 * lukas/erts/fix-ttysl-memcpy-buffer-overwrite/GH-5116/OTP-17560: erts: Fix memcpy buffer overwrite
| * | | | | | | | | Merge branch 'lukas/add-github-actions' into maint-23Erlang/OTP2021-09-021-3/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/add-github-actions: gh-actions: Pin debian version to bullseye gh-actions: Fix libaspell crossenv install Backport github dockerfile changes bf48282 and e4c3fcf
* | | | | | | | | | Merge branch 'maint-22' into maintBjörn Gustavsson2021-09-035-1/+129
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint-22: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
| * | | | | | | | | | Updated OTP versionOTP-22.3.4.21Erlang/OTP2021-09-022-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Prepare releaseErlang/OTP2021-09-027-7/+142
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'bjorn/erts/fix-map-decoding/OTP-17594' into maint-22Erlang/OTP2021-09-022-1/+20
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bjorn/erts/fix-map-decoding/OTP-17594: Make binary_to_term/1 more resilent against bad binaries
| * | | | | | | | | | Merge branch 'lukas/erts/fix-convert-subbin-bugs/OTP-17585' into maint-22Erlang/OTP2021-09-021-2/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/erts/fix-convert-subbin-bugs/OTP-17585: erts: Make re copy small subbinaries
| * | | | | | | | | | Merge branch 'lukas/erts/fix-erl_tracer-use-after-free/PR-4940/OTP-17568' ↵Erlang/OTP2021-09-026-14/+63
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint-22 * lukas/erts/fix-erl_tracer-use-after-free/PR-4940/OTP-17568: erts: Fix use after free for ErtsTracerNif* # Conflicts: # erts/emulator/test/dirty_nif_SUITE.erl # erts/emulator/test/gc_SUITE.erl
| * | | | | | | | | | Merge branch ↵Erlang/OTP2021-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'lukas/erts/fix-ttysl-memcpy-buffer-overwrite/GH-5116/OTP-17560' into maint-22 * lukas/erts/fix-ttysl-memcpy-buffer-overwrite/GH-5116/OTP-17560: erts: Fix memcpy buffer overwrite
| * | | | | | | | | | Merge branch 'lukas/add-github-actions' into maint-22Erlang/OTP2021-09-021-3/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukas/add-github-actions: gh-actions: Pin debian version to bullseye gh-actions: Fix libaspell crossenv install Backport github dockerfile changes bf48282 and e4c3fcf
| * | | | | | | | | | Merge branch 'hasse/stdlib/chars_limit_fix/GH-5053/OTP-17525' into maint-22Erlang/OTP2021-09-022-3/+30
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hasse/stdlib/chars_limit_fix/GH-5053/OTP-17525: stdlib: Fix a concerning io_lib option 'chars_limit' # Conflicts: # lib/stdlib/test/io_SUITE.erl
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/22/dist-auto-connect-crash/GH-4964/OTP-17513' into ↵Erlang/OTP2021-09-023-4/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-22 * sverker/22/dist-auto-connect-crash/GH-4964/OTP-17513: erts: Fix write-after-free bug for DistEntry (AGAIN)
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sverker/net_kernel-hang/GH-4931/OTP-17476' into maint-22Erlang/OTP2021-09-021-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sverker/net_kernel-hang/GH-4931/OTP-17476: kernel: Fix hanging net_kernel
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/monotonic-hrtime/22/OTP-17493' into maint-22Erlang/OTP2021-09-022-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/monotonic-hrtime/22/OTP-17493: Update configure scripts Fix monotonic hrtime configure test
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/schedulers-online-fix/GH-4809/OTP-17500' into maint-22Erlang/OTP2021-09-022-16/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/schedulers-online-fix/GH-4809/OTP-17500: Fix erlang:system_flag(schedulers_online, _)
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bjorn/erts/backport-zlib-fix/ERIERL-657/OTP-17470' into maint-22Erlang/OTP2021-09-022-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bjorn/erts/backport-zlib-fix/ERIERL-657/OTP-17470: zlib: Fix edge case in state flushing
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/cancel_timer_no_info_fix/OTP-17472' into maint-22Erlang/OTP2021-09-022-7/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rickard/cancel_timer_no_info_fix/OTP-17472: Fix erlang:cancel_timer(_, [{info, false}])
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'raimo/work-around-linux-dgram-reconnect/GH-5092/OTP-17559' ↵Raimo Niskanen2021-09-0211-79/+370
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into maint * raimo/work-around-linux-dgram-reconnect/GH-5092/OTP-17559: Test API errors Validate sockaddr tighter Work around Linux DGRAM reconnect misbehaviour Implement setting native socket addresses Work around Linux DGRAM reconnect misbehaviour Test udp reconnect
| * | | | | | | | | | | | | | | | | | Test API errorsRaimo Niskanen2021-08-312-14/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, adjust some inconsistent error returns / exceptions.
| * | | | | | | | | | | | | | | | | | Validate sockaddr tighterRaimo Niskanen2021-08-302-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that all fields in the sockaddr() value are part of the address for the address family. I have myself once too many used #{family =>inet, address => loopback} and then gotten #{family => inet, addr => any} since the address field is named 'addr' so 'address' is ignored and the default for 'addr' is 'any' ({0,0,0,0}).
| * | | | | | | | | | | | | | | | | | Work around Linux DGRAM reconnect misbehaviourRaimo Niskanen2021-08-301-0/+7
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Implement setting native socket addressesRaimo Niskanen2021-08-307-47/+129
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Work around Linux DGRAM reconnect misbehaviourRaimo Niskanen2021-08-301-5/+24
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Test udp reconnectRaimo Niskanen2021-08-301-4/+63
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch ↵Raimo Niskanen2021-09-022-344/+367
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'raimo/kernel/inet-backend-socket-option-parsing/GH-5122/OTP-17580' into maint * raimo/kernel/inet-backend-socket-option-parsing/GH-5122/OTP-17580: Further simplify option parsing Comment out currently dead code due to Dialyzer Fix tests for inet_backend = socket Rewrite option parsing to less messy
| * | | | | | | | | | | | | | | | | | | Further simplify option parsingRaimo Niskanen2021-08-311-131/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use list comprehensions instead of hand crafted non-standard but maybe more optimized functions. Optimize later if needed. Also, change how the protocol name is chosen: Use 'tcp' for domains 'inet' and 'inet6', otherwise 'default', which should correspond to what we know about these protocol domains.
| * | | | | | | | | | | | | | | | | | | Comment out currently dead code due to DialyzerRaimo Niskanen2021-08-261-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix tests for inet_backend = socketRaimo Niskanen2021-08-251-4/+17
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Rewrite option parsing to less messyRaimo Niskanen2021-08-251-322/+406
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #5167 from ↵Hans Nilsson2021-09-021-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HansN/hans/ssh/status_eaccess_fix/GH-5014/OTP-17586 ssh: Handle eacces like enoent in ssh_sftpd:get_attrs/6
| * | | | | | | | | | | | | | | | | | | | ssh: Handle eacces like enoent in ssh_sftpd:get_attrs/6Hans Nilsson2021-08-301-1/+4
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bjorn/erts/fix-map-decoding/OTP-17594' into maintBjörn Gustavsson2021-09-022-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bjorn/erts/fix-map-decoding/OTP-17594: Make binary_to_term/1 more resilent against bad binaries
| * | | | | | | | | | | | | | | | | | | | Make binary_to_term/1 more resilent against bad binariesBjörn Gustavsson2021-09-012-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binary_to_term/1 could crash the runtime system when given a corrupted binary containing the external representation of maps. This commit fixes two issues: * There could multiple frees of the same memory area for a corrupted term containing both large maps and small maps. * Heap space would be allocated according to the number of elements the map was supposed to contain, even if the binary was clearly too short to contain that many elements.