Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/libexec/httpd Pull up following revision(s) (requested by...



details:   https://anonhg.NetBSD.org/src/rev/b6679a3c8d30
branches:  netbsd-9
changeset: 964199:b6679a3c8d30
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 19 11:25:18 2020 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #1134):

        libexec/httpd/bozohttpd.c: revision 1.124

Bozohttpd clobbers files greater than 4GB on 32bit archs.
Make sure the alignment mask derived from pagesize is an off_t.

diffstat:

 libexec/httpd/bozohttpd.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 1751cab89da2 -r b6679a3c8d30 libexec/httpd/bozohttpd.c
--- a/libexec/httpd/bozohttpd.c Mon Nov 16 18:29:48 2020 +0000
+++ b/libexec/httpd/bozohttpd.c Thu Nov 19 11:25:18 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bozohttpd.c,v 1.113 2019/02/28 09:16:42 mrg Exp $      */
+/*     $NetBSD: bozohttpd.c,v 1.113.2.1 2020/11/19 11:25:18 martin Exp $       */
 
 /*     $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $      */
 
@@ -907,7 +907,7 @@
         *
         * we use the write offset in all writes
         */
-       mappedoffset = first_byte_pos & ~(httpd->page_size - 1);
+       mappedoffset = first_byte_pos & ~((off_t)httpd->page_size - 1);
        mappedsz = (size_t)
                (first_byte_pos - mappedoffset + sz + httpd->page_size - 1) &
                ~(httpd->page_size - 1);



Home | Main Index | Thread Index | Old Index