Commit d78bac80 authored by Joe Orton's avatar Joe Orton
Browse files

* modules/ssl/ssl_scache_shmcb.c (shmcb_cyclic_ntoc_memcpy, 

shmcb_cyclic_cton_memcpy): Fix potential shmcb segfault for small
cache sizes.

PR: 27751
Submitted by: Geoff Thorpe <geoff geoffthorpe.net>
Reviewed by: Madhusudan Mathihalli, Joe Orton, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103818 13f79535-47bb-0310-9956-ffa450edef68
parent 7c0adb1f

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.50









  *) mod_ssl: Fix a potential segfault in the 'shmcb' session cache for









     small cache sizes.  PR 27751.  [Geoff Thorpe <geoff geoffthorpe.net>]

















  *) Remove 2Gb log file size restriction on some 32-bit platforms.









     PR 13511.  [Joe Orton]










































STATUS



+1
−5



























Changes for STATUS: 1 added line, 5 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/06/01 15:30:15 $]









Last modified at [$Date: 2004/06/01 20:27:10 $]



















Release:




















@@ -96,10 +96,6 @@ PATCHES TO BACKPORT FROM 2.1







       build/rpm/httpd.spec.in: r1.5









       +1: minfrin, nd



















    *) mod_ssl: Fix potential SEGV in 'shmcb' session cache.









       modules/ssl/ssl_scache_shmcb.c: r1.26









       +1: madhum, jorton, trawick



















    *) mod_cgi: Handle stderr output during script execution









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/generators/mod_cgi.c?r1=1.160&r2=1.163









       PR: 22030, 18348


































modules/ssl/ssl_scache_shmcb.c



+8
−0



























Changes for modules/ssl/ssl_scache_shmcb.c: 8 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -848,6 +848,10 @@ static void shmcb_cyclic_ntoc_memcpy(







    unsigned int dest_offset,









    unsigned char *src, unsigned int src_len)









{









    /* Cover the case that src_len > buf_size */









    if (src_len > buf_size)









        src_len = buf_size;



















    /* Can it be copied all in one go? */









    if (dest_offset + src_len < buf_size)









        /* yes */










@@ -871,6 +875,10 @@ static void shmcb_cyclic_cton_memcpy(







    unsigned int src_offset,









    unsigned int src_len)









{









    /* Cover the case that src_len > buf_size */









    if (src_len > buf_size)









        src_len = buf_size;



















    /* Can it be copied all in one go? */









    if (src_offset + src_len < buf_size)









        /* yes */