diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:17 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:17 +0100 |
| commit | 9e615cb6aa4afcee97f8a1646e5a586261a7b81f (patch) | |
| tree | 0e09fde2404555dc5daf167b38243b5f89c16549 /modules/dav/lock | |
| parent | 1acac7a6b494db24f8f58e44dab7657b6de68742 (diff) | |
| download | apache2-9e615cb6aa4afcee97f8a1646e5a586261a7b81f.tar.gz | |
Upstream tarball 2.2.8upstream/2.2.8
Diffstat (limited to 'modules/dav/lock')
| -rw-r--r-- | modules/dav/lock/locks.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/dav/lock/locks.c b/modules/dav/lock/locks.c index 2b297a8c..a4e0e214 100644 --- a/modules/dav/lock/locks.c +++ b/modules/dav/lock/locks.c @@ -603,8 +603,7 @@ static dav_error * dav_generic_load_lock_record(dav_lockdb *lockdb, offset += sizeof(dp->f); /* Copy the lock token. */ - dp->locktoken = apr_palloc(p, sizeof(*dp->locktoken)); - memcpy(dp->locktoken, val.dptr + offset, sizeof(*dp->locktoken)); + dp->locktoken = apr_pmemdup(p, val.dptr + offset, sizeof(*dp->locktoken)); offset += sizeof(*dp->locktoken); /* Do we have an owner field? */ @@ -639,16 +638,14 @@ static dav_error * dav_generic_load_lock_record(dav_lockdb *lockdb, /* Create and fill a dav_lock_indirect structure */ ip = apr_pcalloc(p, sizeof(*ip)); - ip->locktoken = apr_palloc(p, sizeof(*ip->locktoken)); - memcpy(ip->locktoken, val.dptr + offset, sizeof(*ip->locktoken)); + ip->locktoken = apr_pmemdup(p, val.dptr + offset, sizeof(*ip->locktoken)); offset += sizeof(*ip->locktoken); memcpy(&ip->timeout, val.dptr + offset, sizeof(ip->timeout)); offset += sizeof(ip->timeout); /* length of datum */ ip->key.dsize = *((int *) (val.dptr + offset)); offset += sizeof(ip->key.dsize); - ip->key.dptr = apr_palloc(p, ip->key.dsize); - memcpy(ip->key.dptr, val.dptr + offset, ip->key.dsize); + ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize); offset += ip->key.dsize; if (!dav_generic_lock_expired(ip->timeout)) { |