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/12 12:26:23 UTC
svn commit: r1481513 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/dav/main/props.c
Author: minfrin
Date: Sun May 12 10:26:22 2013
New Revision: 1481513
URL: http://svn.apache.org/r1481513
Log:
mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559
trunk patch: http://svn.apache.org/r1476645
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, covener, sf
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/main/props.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1476645
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1481513&r1=1481512&r2=1481513&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun May 12 10:26:22 2013
@@ -2,6 +2,9 @@
Changes with Apache 2.4.5
+ *) mod_dav: Do not segfault on PROPFIND with a zero length DBM.
+ PR 52559 [Diego Santa Cruz <diego.santaCruz spinetix.com>]
+
*) core: Improve error message where client's request-line exceeds
LimitRequestLine. PR 54384 [Christophe Jaillet]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1481513&r1=1481512&r2=1481513&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun May 12 10:26:22 2013
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559
- trunk patch: http://svn.apache.org/r1476645
- 2.4.x patch: trunk patch works (minus CHANGES)
- +1: minfrin, covener, sf
-
* event MPM: Provide error handling for ThreadStackSize. PR 54311
trunk patch: http://svn.apache.org/r1433682
2.4.x patch: http://people.apache.org/~minfrin/httpd-event-ThreadStackSize-error.patch
Modified: httpd/httpd/branches/2.4.x/modules/dav/main/props.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/props.c?rev=1481513&r1=1481512&r2=1481513&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/main/props.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/props.c Sun May 12 10:26:22 2013
@@ -594,13 +594,14 @@ DAV_DECLARE(dav_get_props_result) dav_ge
if (propdb->db != NULL) {
dav_xmlns_info *xi = dav_xmlns_create(propdb->p);
dav_prop_name name;
+ dav_error *err;
/* define (up front) any namespaces the db might need */
(void) (*db_hooks->define_namespaces)(propdb->db, xi);
/* get the first property name, beginning the scan */
- (void) (*db_hooks->first_name)(propdb->db, &name);
- while (name.ns != NULL) {
+ err = (*db_hooks->first_name)(propdb->db, &name);
+ while (!err && name.ns) {
/*
** We also look for <DAV:getcontenttype> and
@@ -619,7 +620,6 @@ DAV_DECLARE(dav_get_props_result) dav_ge
}
if (what == DAV_PROP_INSERT_VALUE) {
- dav_error *err;
int found;
if ((err = (*db_hooks->output_value)(propdb->db, &name,
@@ -638,7 +638,7 @@ DAV_DECLARE(dav_get_props_result) dav_ge
}
next_key:
- (void) (*db_hooks->next_name)(propdb->db, &name);
+ err = (*db_hooks->next_name)(propdb->db, &name);
}
/* all namespaces have been entered into xi. generate them into