diff options
| author |   otto <otto@openbsd.org> | 2017-04-06 17:00:52 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2017-04-06 17:00:52 +0000 |
| commit | 723ff3667f064c8999ab05e1224a8524fe974e96 (patch) | |
| tree | aa32f57c97202f6c5fae646aa709aa72c7dbf565 | |
| parent | Check that local syslog messages have the the expected priority. (diff) | |
| download | wireguard-openbsd-723ff3667f064c8999ab05e1224a8524fe974e96.tar.xz wireguard-openbsd-723ff3667f064c8999ab05e1224a8524fe974e96.zip | |
Consistentcy between nmembers and size order. From Christopher Hettrick;
ok deraadt@
| -rw-r--r-- | lib/libc/stdlib/malloc.3 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3 index 42cf9ba9a92..c65c08ef985 100644 --- a/lib/libc/stdlib/malloc.3 +++ b/lib/libc/stdlib/malloc.3 @@ -30,9 +30,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: malloc.3,v 1.108 2017/03/29 17:38:37 otto Exp $ +.\" $OpenBSD: malloc.3,v 1.109 2017/04/06 17:00:52 otto Exp $ .\" -.Dd $Mdocdate: March 29 2017 $ +.Dd $Mdocdate: April 6 2017 $ .Dt MALLOC 3 .Os .Sh NAME @@ -177,9 +177,9 @@ is set to .Er ENOMEM . .Pp If -.Fa size -or .Fa nmemb +or +.Fa size is equal to 0, a unique pointer to an access protected, zero sized object is returned. Access via this pointer will generate a @@ -346,7 +346,7 @@ size_t num, size; if (size && num > SIZE_MAX / size) errc(1, EOVERFLOW, "overflow"); -if ((p = malloc(size * num)) == NULL) +if ((p = malloc(num * size)) == NULL) err(1, NULL); .Ed .Pp @@ -364,7 +364,7 @@ if (size < 0 || num < 0) if (size && num > INT_MAX / size) errc(1, EOVERFLOW, "overflow"); -if ((p = malloc(size * num)) == NULL) +if ((p = malloc(num * size)) == NULL) err(1, NULL); .Ed .Pp @@ -471,9 +471,9 @@ functions conform to .St -ansiC . .Pp If -.Fa size -or .Fa nmemb +or +.Fa size are 0, the return value is implementation defined; other conforming implementations may return .Dv NULL |