summaryrefslogtreecommitdiffstats
path: root/modules/dav/fs/lock.c
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2004-09-13 00:24:05 +0200
committerJoe Orton <jorton@apache.org>2004-09-13 00:24:05 +0200
commit34cdcdfde8cc79501b872c4232d4453ade6ccb6e (patch)
tree930cb6d8bc31cabf8c8e03f4587943f2c48b84fc /modules/dav/fs/lock.c
parent* modules/dav/fs/lock.c (dav_size_indirect): Fix indirect lock record (diff)
downloadapache2-34cdcdfde8cc79501b872c4232d4453ade6ccb6e.tar.xz
apache2-34cdcdfde8cc79501b872c4232d4453ade6ccb6e.zip
* modules/dav/fs/lock.c (dav_fs_refresh_locks): Fix SEGV on refresh of
indirect lock. PR: 31183 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105100 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/dav/fs/lock.c')
-rw-r--r--modules/dav/fs/lock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/dav/fs/lock.c b/modules/dav/fs/lock.c
index ba79f5e221..96ca534321 100644
--- a/modules/dav/fs/lock.c
+++ b/modules/dav/fs/lock.c
@@ -1469,13 +1469,13 @@ static dav_error * dav_fs_refresh_locks(dav_lockdb *lockdb,
}
if (dav_fs_do_refresh(dp_scan, ltl, new_time)) {
/* the lock was refreshed. return the lock. */
- newlock = dav_fs_alloc_lock(lockdb, ip->key, dp->locktoken);
+ newlock = dav_fs_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
newlock->is_locknull = !resource->exists;
- newlock->scope = dp->f.scope;
- newlock->type = dp->f.type;
- newlock->depth = dp->f.depth;
- newlock->timeout = dp->f.timeout;
- newlock->owner = dp->owner;
+ newlock->scope = dp_scan->f.scope;
+ newlock->type = dp_scan->f.type;
+ newlock->depth = dp_scan->f.depth;
+ newlock->timeout = dp_scan->f.timeout;
+ newlock->owner = dp_scan->owner;
newlock->auth_user = dp_scan->auth_user;
newlock->next = *locks;