* 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>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@331041 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index babc003af1d719b9a022dc7c1bcf8ed518f14d6b..47fdad8d7be9c8769cc6ec733bf3aa0bb4732418 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
 

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 47dfab00394e521756c93aacdb3796012b152ddc..937aeadc2fa7dd602d31bb8b534d0942b59e0061 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2508,7 +2508,7 @@ static int dav_method_mkcol(request_rec *r)
     }
     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.",