diff options
author | otto <> | 2017-04-06 17:00:52 +0000 |
---|---|---|
committer | otto <> | 2017-04-06 17:00:52 +0000 |
commit | ceedd2043e7fddb476a2982e329010bbd90e9ac5 (patch) | |
tree | a729ab08a6eb894cf6678c90da1de6f17dfa3abc /src | |
parent | 6e19b2b9844e5af96bfcfb24a2c89b83b99766ff (diff) | |
download | openbsd-ceedd2043e7fddb476a2982e329010bbd90e9ac5.tar.gz openbsd-ceedd2043e7fddb476a2982e329010bbd90e9ac5.tar.bz2 openbsd-ceedd2043e7fddb476a2982e329010bbd90e9ac5.zip |
Consistentcy between nmembers and size order. From Christopher Hettrick;
ok deraadt@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/stdlib/malloc.3 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libc/stdlib/malloc.3 b/src/lib/libc/stdlib/malloc.3 index 42cf9ba9a9..c65c08ef98 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.108 2017/03/29 17:38:37 otto Exp $ | 33 | .\" $OpenBSD: malloc.3,v 1.109 2017/04/06 17:00:52 otto Exp $ |
34 | .\" | 34 | .\" |
35 | .Dd $Mdocdate: March 29 2017 $ | 35 | .Dd $Mdocdate: April 6 2017 $ |
36 | .Dt MALLOC 3 | 36 | .Dt MALLOC 3 |
37 | .Os | 37 | .Os |
38 | .Sh NAME | 38 | .Sh NAME |
@@ -177,9 +177,9 @@ is set to | |||
177 | .Er ENOMEM . | 177 | .Er ENOMEM . |
178 | .Pp | 178 | .Pp |
179 | If | 179 | If |
180 | .Fa size | ||
181 | or | ||
182 | .Fa nmemb | 180 | .Fa nmemb |
181 | or | ||
182 | .Fa size | ||
183 | is equal to 0, a unique pointer to an access protected, | 183 | is equal to 0, a unique pointer to an access protected, |
184 | zero sized object is returned. | 184 | zero sized object is returned. |
185 | Access via this pointer will generate a | 185 | Access via this pointer will generate a |
@@ -346,7 +346,7 @@ size_t num, size; | |||
346 | if (size && num > SIZE_MAX / size) | 346 | if (size && num > SIZE_MAX / size) |
347 | errc(1, EOVERFLOW, "overflow"); | 347 | errc(1, EOVERFLOW, "overflow"); |
348 | 348 | ||
349 | if ((p = malloc(size * num)) == NULL) | 349 | if ((p = malloc(num * size)) == NULL) |
350 | err(1, NULL); | 350 | err(1, NULL); |
351 | .Ed | 351 | .Ed |
352 | .Pp | 352 | .Pp |
@@ -364,7 +364,7 @@ if (size < 0 || num < 0) | |||
364 | if (size && num > INT_MAX / size) | 364 | if (size && num > INT_MAX / size) |
365 | errc(1, EOVERFLOW, "overflow"); | 365 | errc(1, EOVERFLOW, "overflow"); |
366 | 366 | ||
367 | if ((p = malloc(size * num)) == NULL) | 367 | if ((p = malloc(num * size)) == NULL) |
368 | err(1, NULL); | 368 | err(1, NULL); |
369 | .Ed | 369 | .Ed |
370 | .Pp | 370 | .Pp |
@@ -471,9 +471,9 @@ functions conform to | |||
471 | .St -ansiC . | 471 | .St -ansiC . |
472 | .Pp | 472 | .Pp |
473 | If | 473 | If |
474 | .Fa size | ||
475 | or | ||
476 | .Fa nmemb | 474 | .Fa nmemb |
475 | or | ||
476 | .Fa size | ||
477 | are 0, the return value is implementation defined; | 477 | are 0, the return value is implementation defined; |
478 | other conforming implementations may return | 478 | other conforming implementations may return |
479 | .Dv NULL | 479 | .Dv NULL |