From: Joe Orton <jorton@apache.org>
Date: Sun, 12 Sep 2004 22:14:57 +0000 (+0000)
Subject: * modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record
X-Git-Tag: 2.1.1~283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=176d3378b2755ec2bdbc83a9bfaca0c24d042f05;p=thirdparty%2Fapache%2Fhttpd.git

* modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record
handling on 64-bit platforms: use correct size of apr_datum_t.dsize
field.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105099 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
index 9331174ef4c..ba79f5e2215 100644
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -66,7 +66,7 @@
 **    INDIRECT LOCK:   [char      (DAV_LOCK_INDIRECT),
 **			apr_uuid_t locktoken,
 **			time_t     expires,
-**			int        key_size,
+**			apr_size_t key_size,
 **			char[]     key]
 **       The key is to the collection lock that resulted in this indirect lock
 */
@@ -157,7 +157,7 @@ typedef struct dav_lock_indirect
 /* Stored indirect lock info - lock token and apr_datum_t */
 #define dav_size_indirect(a)	(1 + sizeof(apr_uuid_t) \
 				 + sizeof(time_t) \
-				 + sizeof(int) + (a)->key.dsize)
+				 + sizeof((a)->key.dsize) + (a)->key.dsize)
 
 /*
 ** The lockdb structure.