Merge r331041 from trunk:

* 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/branches/2.2.x@332657 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ffcd33eefda5434ed527bae7ad0f0bc776d9111b..63e2a522d43b7aade5cc0516260aa2f369e34667 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.10
 
+  *) mod_dav: Fix a null pointer dereference in an error code path during the
+     handling of MKCOL.
+     [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]
+
   *) mod_proxy_balancer: When finding best worker, use case insensitive
      match for scheme and host, but case sensitive for the rest of
      the path. [Jim Jagielski, Ruediger Pluem]

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 98d911b4cb1fa2dd7bf1a8f038ae05e3c8cd68b3..d1ca3713938c81d8f6f67c3988fc3effe2b4c25b 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.",