From: Colm MacCarthaigh <colm@apache.org>
Date: Mon, 23 Jan 2006 20:23:25 +0000 (+0000)
Subject: Merge r331041 from trunk:
X-Git-Tag: 2.0.56~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8353579a37f1b4488019cc286dad882670561b14;p=thirdparty%2Fapache%2Fhttpd.git

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>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371650 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a5b5cbdae6a..906fd9d639b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) mod_dav: Fix a null pointer dereference in an error code path during the
+     handling of MKCOL. [Ghassan Misherghi <ghassanm ucdavis.edu>]
+
   *) mod_mime_magic: Handle CRLF-format magic files so that it works with
      the default installation on Windows.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index 08ab6da5e86..9b136d2938d 100644
--- a/STATUS
+++ b/STATUS
@@ -133,14 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs?view=rev&rev=154319
        +1: stoddard, striker, wrowe (as corrected in subsequent patches)
 
-    *) mod_dav: Fix a null pointer dereference in an error code path during the
-       handling of MKCOL.
-       Trunk version of patch:
-          http://svn.apache.org/viewcvs.cgi?rev=331041&view=rev
-       Backport version for 2.0.x of patch:
-          Trunk version of patch will work
-       +1: rpluem, trawick, colm
-
     *) mod_deflate: Fix PR37559 (mod_deflate + mod_proxy overwrite the
        Vary: header)
        Trunk version of patch:
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index cbd212d7829..fff71cdd54c 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2490,7 +2490,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.",