Commit 1c5db41c authored by Jeff Trawick's avatar Jeff Trawick
Browse files

pick this up from 2.1-dev: 

mod_dav: Fix a problem that could cause crashes when manipulating
locks on some platforms.

Reviewed by:	jorton, nd


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

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_dav: Fix a problem that could cause crashes when manipulating 









     locks on some platforms.  [Jeff Trawick]

















  *) mod_headers no longer crashes if an empty header value should









     be added.  [Andr Malo]










































STATUS



+1
−6



























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



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/04/24 20:09:30 $]









Last modified at [$Date: 2004/04/26 15:45:52 $]



















Release:




















@@ -197,11 +197,6 @@ PATCHES TO BACKPORT FROM 2.1







       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_auth_digest.c?r1=1.86&r2=1.87









       +1: geoff, nd



















    *) mod_dav: Fix a problem that could cause crashes when manipulating 









       locks on some platforms. (especially Sparc!!!)









           modules/dav/fs/lock.c: r1.31









       +1: trawick, jorton, nd



















    *) mod_dav: Fix a 2617 compliance issue









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/util.c?r1=1.53&r2=1.54









       +1: jorton, nd


































modules/dav/fs/lock.c



+1
−1



























Changes for modules/dav/fs/lock.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -652,7 +652,7 @@ static dav_error * dav_fs_load_lock_record(dav_lockdb *lockdb, apr_datum_t key,







	    offset += sizeof(*ip->locktoken);









	    memcpy(&ip->timeout, val.dptr + offset, sizeof(ip->timeout));









	    offset += sizeof(ip->timeout);









	    ip->key.dsize = *((int *) (val.dptr + offset));	/* length of datum */









            memcpy(&ip->key.dsize, val.dptr + offset, sizeof(ip->key.dsize)); /* length of datum */









	    offset += sizeof(ip->key.dsize);









	    ip->key.dptr = apr_palloc(p, ip->key.dsize); 









	    memcpy(ip->key.dptr, val.dptr + offset, ip->key.dsize);