Tue May 31 19:44:47 2016 UTC ()

Avoid CVE-2016-4450 (NULL dereference while saving client body to
temporary file). Bump revision.


(joerg)

diff -r1.63 -r1.64 pkgsrc/www/nginx/Makefile
diff -r0 -r1.1 pkgsrc/www/nginx/patches/patch-src_os_unix_ngx__files.c

--- pkgsrc/www/nginx/Makefile 2016/03/05 11:29:38 1.63
+++ pkgsrc/www/nginx/Makefile 2016/05/31 19:44:47 1.64

 @@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2016/03/05 11:29:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.64 2016/05/31 19:44:47 joerg Exp $
 DISTNAME=		nginx-1.8.1
 MAINTAINER=		joerg@NetBSD.org
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../www/nginx/Makefile.common"

$NetBSD: patch-src_os_unix_ngx__files.c,v 1.1 2016/05/31 19:44:47 joerg Exp $

--- src/os/unix/ngx_files.c.orig	2016-01-26 14:39:33.000000000 +0000
+++ src/os/unix/ngx_files.c
@@ -292,6 +292,12 @@ ngx_write_chain_to_file(ngx_file_t *file
         /* create the iovec and coalesce the neighbouring bufs */
 
         while (cl && vec.nelts < IOV_MAX) {
+
+            if (ngx_buf_special(cl->buf)) {
+                cl = cl->next;
+                continue;
+            }
+
             if (prev == cl->buf->pos) {
                 iov->iov_len += cl->buf->last - cl->buf->pos;