diff options
author | pirofti <> | 2012-09-13 10:45:41 +0000 |
---|---|---|
committer | pirofti <> | 2012-09-13 10:45:41 +0000 |
commit | 8f409243836a1786c7d0e6e453bddef662e8f3c7 (patch) | |
tree | bfa445b2e23ec7f0afe6debecef126e6a698d7aa /src | |
parent | 714f0cfc8d40781a56bc8381be958894e536ebec (diff) | |
download | openbsd-8f409243836a1786c7d0e6e453bddef662e8f3c7.tar.gz openbsd-8f409243836a1786c7d0e6e453bddef662e8f3c7.tar.bz2 openbsd-8f409243836a1786c7d0e6e453bddef662e8f3c7.zip |
Fix precedence bug (& has lower precedence than !=).
Okay otto@.
Found by Michal Mazurek <akfaew at jasminek dot net>, thanks!
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libc/stdlib/malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index ff71da8f6e..c69ec8316a 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: malloc.c,v 1.146 2012/07/09 08:39:24 deraadt Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.147 2012/09/13 10:45:41 pirofti Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> |
4 | * | 4 | * |
@@ -1429,7 +1429,7 @@ mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) | |||
1429 | { | 1429 | { |
1430 | void *p, *q; | 1430 | void *p, *q; |
1431 | 1431 | ||
1432 | if (alignment < MALLOC_PAGESIZE || alignment & (alignment - 1) != 0) { | 1432 | if (alignment < MALLOC_PAGESIZE || ((alignment - 1) & alignment) != 0) { |
1433 | wrterror("mapalign bad alignment", NULL); | 1433 | wrterror("mapalign bad alignment", NULL); |
1434 | return MAP_FAILED; | 1434 | return MAP_FAILED; |
1435 | } | 1435 | } |