diff options
author | deraadt <> | 2025-05-23 00:40:05 +0000 |
---|---|---|
committer | deraadt <> | 2025-05-23 00:40:05 +0000 |
commit | db3d36558deff54e8a47e96933acd4543d7eb05f (patch) | |
tree | b340c64feaff7828e767291850aba4b7afa291a5 /src/lib/libc/stdlib/malloc.3 | |
parent | d6d6b23a49d21d2881e12b770fba4750c19047db (diff) | |
download | openbsd-db3d36558deff54e8a47e96933acd4543d7eb05f.tar.gz openbsd-db3d36558deff54e8a47e96933acd4543d7eb05f.tar.bz2 openbsd-db3d36558deff54e8a47e96933acd4543d7eb05f.zip |
When commons were deprecated, noone noticed that malloc_options in static
binaries had become unlinkable. Change the libc definition to weak to solve
that, and to "const char * const" so that noone will try to set it late.
It must be stable before the first malloc() call, which could be before
main()...
discussion with otto, kettenis, tedu
Diffstat (limited to 'src/lib/libc/stdlib/malloc.3')
-rw-r--r-- | src/lib/libc/stdlib/malloc.3 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libc/stdlib/malloc.3 b/src/lib/libc/stdlib/malloc.3 index bea5575bf8..b0c6fb782b 100644 --- a/src/lib/libc/stdlib/malloc.3 +++ b/src/lib/libc/stdlib/malloc.3 | |||
@@ -30,9 +30,9 @@ | |||
30 | .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 30 | .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
31 | .\" SUCH DAMAGE. | 31 | .\" SUCH DAMAGE. |
32 | .\" | 32 | .\" |
33 | .\" $OpenBSD: malloc.3,v 1.142 2024/08/03 20:09:24 guenther Exp $ | 33 | .\" $OpenBSD: malloc.3,v 1.143 2025/05/23 00:40:05 deraadt Exp $ |
34 | .\" | 34 | .\" |
35 | .Dd $Mdocdate: August 3 2024 $ | 35 | .Dd $Mdocdate: May 23 2025 $ |
36 | .Dt MALLOC 3 | 36 | .Dt MALLOC 3 |
37 | .Os | 37 | .Os |
38 | .Sh NAME | 38 | .Sh NAME |
@@ -69,7 +69,8 @@ | |||
69 | .Fn malloc_conceal "size_t size" | 69 | .Fn malloc_conceal "size_t size" |
70 | .Ft void * | 70 | .Ft void * |
71 | .Fn calloc_conceal "size_t nmemb" "size_t size" | 71 | .Fn calloc_conceal "size_t nmemb" "size_t size" |
72 | .Vt char *malloc_options ; | 72 | .Vt const char * const |
73 | .Va malloc_options ; | ||
73 | .Sh DESCRIPTION | 74 | .Sh DESCRIPTION |
74 | The standard functions | 75 | The standard functions |
75 | .Fn malloc , | 76 | .Fn malloc , |
@@ -265,7 +266,7 @@ value of the | |||
265 | .Xr sysctl 2 , | 266 | .Xr sysctl 2 , |
266 | next checks the environment for a variable called | 267 | next checks the environment for a variable called |
267 | .Ev MALLOC_OPTIONS , | 268 | .Ev MALLOC_OPTIONS , |
268 | and finally looks at the global variable | 269 | and finally looks at the pre-initialized global variable |
269 | .Va malloc_options | 270 | .Va malloc_options |
270 | in the program. | 271 | in the program. |
271 | Each is scanned for the flags documented below. | 272 | Each is scanned for the flags documented below. |