From: Jeff Trawick <trawick@apache.org>
Date: Mon, 26 Apr 2004 15:45:52 +0000 (+0000)
Subject: pick this up from 2.1-dev:
X-Git-Tag: 2.0.50~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=657b51831f48440e78ec7e17942a9dbd2dec45fa;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/CHANGES b/CHANGES
index b8bf10aa7f3..1d2e171145e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 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]
 
diff --git a/STATUS b/STATUS
index 7b1231ed2cc..d5864818f5d 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 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
diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
index 479e60cd6f1..a0e47ed3c29 100644
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -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);