httpd-bugs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bugzi...@apache.org
Subject [Bug 50773] Dav lock database corruption
Date Sat, 27 Apr 2013 17:20:58 GMT
https://issues.apache.org/bugzilla/show_bug.cgi?id=50773

--- Comment #5 from Graham Leggett <minfrin@sharp.fm> ---
I have modified the patch so that it applies to trunk as follows, can you
verify this fixes it for you?

Index: modules/dav/lock/locks.c
===================================================================
--- modules/dav/lock/locks.c    (revision 1476625)
+++ modules/dav/lock/locks.c    (working copy)
@@ -646,7 +646,8 @@
             ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize);
             offset += ip->key.dsize;

-            if (!dav_generic_lock_expired(ip->timeout)) {
+            if (!dav_generic_lock_expired(ip->timeout)
+                    && dav_dbm_exists(lockdb->info->db, ip->key)) {
                 ip->next = *indirect;
                 *indirect = ip;
             }
@@ -847,6 +848,7 @@
         else {
             /* DAV_GETLOCKS_PARTIAL */
             newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL;
+            newlock->timeout = ip->timeout;
         }

         /* hook into the result list */

-- 
You are receiving this mail because:
You are the assignee for the bug.

---------------------------------------------------------------------
To unsubscribe, e-mail: bugs-unsubscribe@httpd.apache.org
For additional commands, e-mail: bugs-help@httpd.apache.org


Mime
View raw message