From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 30 Aug 2010 09:41:38 +0000 (+0000)
Subject: * temp_sa is already the correct pointer.
X-Git-Tag: 2.3.9~526
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6299b13244ef457919d4660df1e4c2625e5b3e1;p=thirdparty%2Fapache%2Fhttpd.git

* temp_sa is already the correct pointer.

PR: 49838
Submitted by: Andrew Skalski <voltara gmail.com>
Reviewed by: rpluem


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

diff --git a/CHANGES b/CHANGES
index b7cea31f4a3..783238cae6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.9
 
+  *) mod_remoteip: Fix a segfaulti when using mod_remoteip in conjunction with
+     Allow/Deny. PR 49838.  [Andrew Skalski <voltara gmail.com>]
+
   *) core: DirectoryMatch can now match on the end of line character ($),
      and sub-directories of matched directories are no longer implicitly
      matched.  PR49809 [Eric Covener]
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 6d9a324f0f0..b7f2f17dcf2 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -409,7 +409,7 @@ static int remoteip_modify_connection(request_rec *r)
      */
     c->remote_ip = apr_pstrdup(c->pool, c->remote_ip);
     conn->proxied_ip = c->remote_ip;
-    memcpy(&conn->proxied_addr, &temp_sa, sizeof(temp_sa));
+    memcpy(&conn->proxied_addr, temp_sa, sizeof(*temp_sa));
     conn->proxied_addr.pool = c->pool;
     c->remote_addr = &conn->proxied_addr;