r3141 merge:
fix posix_memalign() error handling
diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c
index c38d7d2..2531174 100644
--- a/src/os/unix/ngx_alloc.c
+++ b/src/os/unix/ngx_alloc.c
@@ -51,11 +51,15 @@
ngx_memalign(size_t alignment, size_t size, ngx_log_t *log)
{
void *p;
+ int err;
- if (posix_memalign(&p, alignment, size) == -1) {
- ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
+ err = posix_memalign(&p, alignment, size);
+
+ if (err) {
+ ngx_log_error(NGX_LOG_EMERG, log, err,
"posix_memalign() %uz bytes aligned to %uz failed",
size, alignment);
+ p = NULL;
}
ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0,
