You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/05/26 21:53:59 UTC
svn commit: r1486458 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/dav/fs/dbm.c
Author: minfrin
Date: Sun May 26 19:53:59 2013
New Revision: 1486458
URL: http://svn.apache.org/r1486458
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/dav/fs/dbm.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1476642
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1486458&r1=1486457&r2=1486458&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun May 26 19:53:59 2013
@@ -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>]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486458&r1=1486457&r2=1486458&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun May 26 19:53:59 2013
@@ -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)
Modified: httpd/httpd/branches/2.4.x/modules/dav/fs/dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/fs/dbm.c?rev=1486458&r1=1486457&r2=1486458&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/fs/dbm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/fs/dbm.c Sun May 26 19:53:59 2013
@@ -731,6 +731,10 @@ static dav_error * dav_propdb_get_rollba
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);