svn commit: r331041 - in /httpd/httpd/trunk: CHANGES modules/dav/main/mod_dav.c

[rp...@apache.org]

Author: rpluem
Date: Sat Nov  5 14:37:30 2005
New Revision: 331041

URL: http://svn.apache.org/viewcvs?rev=331041&view=rev
Log:
* Fix a null pointer dereference in dav_method_mkcol during the handling of
  errors from dav_auto_checkin.

Submitted by: Ghassan Misherghi <ghassanm ucdavis.edu>

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/dav/main/mod_dav.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=331041&r1=331040&r2=331041&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Nov  5 14:37:30 2005
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_dav: Fix a null pointer dereference in an error code path during the
+     handling of MKCOL.
+     [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]
+
   *) Fix DESTDIR=... installation when using bundled copy of APR.
      [Torsten Foertsch <torsten.foertsch gmx.net>]
 

Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/main/mod_dav.c?rev=331041&r1=331040&r2=331041&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.c Sat Nov  5 14:37:30 2005
@@ -2508,7 +2508,7 @@
     }
     if (err2 != NULL) {
         /* just log a warning */
-        err = dav_push_error(r->pool, err->status, 0,
+        err = dav_push_error(r->pool, err2->status, 0,
                              "The MKCOL was successful, but there "
                              "was a problem automatically checking in "
                              "the parent collection.",