Mercurial > hg > nginx
view src/os/unix/ngx_aio_read_chain.c @ 5050:f9a29f401770 stable-1.2
Merge of r4983: crypt_r() error handling fixed.
The crypt_r() function returns NULL on errors, check it explicitly instead
of assuming errno will remain 0 if there are no errors (per POSIX, the
setting of errno after a successful call to a function is unspecified
unless the description of that function specifies that errno shall not
be modified).
Additionally, dropped unneeded ngx_set_errno(0) and fixed error handling
of memory allocation after normal crypt(), which was inapropriate and
resulted in null pointer dereference on allocation failures.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 11 Feb 2013 12:37:06 +0000 |
parents | d620f497c50f |
children | ec81934727a1 |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl) { int n; u_char *buf, *prev; size_t size; ssize_t total; if (c->read->pending_eof) { c->read->ready = 0; return 0; } total = 0; while (cl) { /* we can post the single aio operation only */ if (!c->read->ready) { return total ? total : NGX_AGAIN; } buf = cl->buf->last; prev = cl->buf->last; size = 0; /* coalesce the neighbouring bufs */ while (cl && prev == cl->buf->last) { size += cl->buf->end - cl->buf->last; prev = cl->buf->end; cl = cl->next; } n = ngx_aio_read(c, buf, size); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_read: %d", n); if (n == NGX_AGAIN) { return total ? total : NGX_AGAIN; } if (n == NGX_ERROR) { return NGX_ERROR; } if (n == 0) { c->read->pending_eof = 1; if (total) { c->read->eof = 0; c->read->ready = 1; } return total; } if (n > 0) { total += n; } ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_read total: %d", total); } return total ? total : NGX_AGAIN; }