mod_dav: When a PROPPATCH attempts to remove a non-existent dead

property on a resource for which there is no dead property in the same
namespace httpd segfaults. PR 52559

trunk patch: http://svn.apache.org/r1476642
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, jim, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1486458 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d24a171a02bffbee72702f12fac9eb6d85540d70..13bbbde2e4803b17e476667bb9049a9e7cf5c79b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_dav: When a PROPPATCH attempts to remove a non-existent dead
+     property on a resource for which there is no dead property in the same
+     namespace httpd segfaults. PR 52559 [Diego Santa Cruz
+     <diego.santaCruz spinetix.com>]
+
   *) mod_dav: Sending a If or If-Match header with an invalid ETag doesn't
      result in a 412 Precondition Failed. PR54610 [Timothy Wood
      <tjw omnigroup.com>]

diff --git a/STATUS b/STATUS
index 07dfcd20223389db045775fbbf4ba72ac29d30cc..11fa7b724e9985a555186fe5fc4bafcdb5c614fc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,13 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
   
-    * mod_dav: When a PROPPATCH attempts to remove a non-existent dead
-      property on a resource for which there is no dead property in the same
-      namespace httpd segfaults. PR 52559
-      trunk patch: http://svn.apache.org/r1476642
-      2.4.x patch: trunk patch works (minus CHANGES)
-      +1: minfrin, jim, jorton
-
     * mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559
       trunk patch: http://svn.apache.org/r1476644
       2.4.x patch: trunk patch works (minus CHANGES)

diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c
index 53a97e91f2a0110af354b881db4ebadfc9693114..9089373991a924f2ddbecd79f6f7599f4d153eba 100644 (file)
--- a/modules/dav/fs/dbm.c
+++ b/modules/dav/fs/dbm.c
@@ -731,6 +731,10 @@ static dav_error * dav_propdb_get_rollback(dav_db *db,
 static dav_error * dav_propdb_apply_rollback(dav_db *db,
                                              dav_deadprop_rollback *rollback)
 {
+    if (!rollback) {
+        return NULL; /* no rollback, nothing to do */
+    }
+
     if (rollback->value.dptr == NULL) {
         /* don't fail if the thing isn't really there. */
         (void) dav_dbm_delete(db, rollback->key);