Commit 904b721b authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

mod_dav: Do not fail PROPPATCH when prop namespace is not known. 

PR: 52559
Backports: r1476644
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, wrowe, rjung



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1497457 13f79535-47bb-0310-9956-ffa450edef68
parent f4e86477

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ Changes with Apache 2.2.25 
     namespace httpd segfaults. PR 52559 [Diego Santa Cruz

     <diego.santaCruz spinetix.com>]



  *) mod_dav: Do not fail PROPPATCH when prop namespace is not known.

     PR 52559 [Diego Santa Cruz <diego.santaCruz spinetix.com>]



Changes with Apache 2.2.24



  *) SECURITY: CVE-2012-3499 (cve.mitre.org)

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -96,13 +96,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]

  

  * mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559

    [Diego Santa Cruz <diego.santaCruz spinetix.com>]

    trunk patch: http://svn.apache.org/r1476644

    2.4.x patch: http://svn.apache.org/r1486459

    2.2.x patch: trunk patch works (minus CHANGES)

    +1: minfrin, wrowe, rjung



  * mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559

    [Diego Santa Cruz <diego.santaCruz spinetix.com>]

    This is the third patch in PR 52559. The other two are already

modules/dav/fs/dbm.c

+9 −1
Original line number Diff line number Diff line
@@ -191,7 +191,15 @@ void dav_dbm_close(dav_db *db) 


dav_error * dav_dbm_fetch(dav_db *db, apr_datum_t key, apr_datum_t *pvalue)

{

    apr_status_t status = apr_dbm_fetch(db->file, key, pvalue);

    apr_status_t status;



    if (!key.dptr) {

        /* no key could be created (namespace not known) => no value */

        memset(pvalue, 0, sizeof(*pvalue));

        status = APR_SUCCESS;

    } else {

        status = apr_dbm_fetch(db->file, key, pvalue);

    }



    return dav_fs_dbm_error(db, NULL, status);

}