Mercurial > hg > nginx

changeset 3320:d4ad1b0b6c8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix posix_memalign() error handling
author Igor Sysoev <igor@sysoev.ru>
date Sun, 15 Nov 2009 08:56:40 +0000
parents be47fe127f8c
children 93e8daca5dbb
files src/os/unix/ngx_alloc.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/unix/ngx_alloc.c
+++ b/src/os/unix/ngx_alloc.c
@@ -51,11 +51,15 @@ void *
 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,