From: Giovanni Bechis <gbechis@apache.org>
Date: Tue, 28 Jun 2022 13:05:20 +0000 (+0000)
Subject: check apr_sockaddr_info_get() return value
X-Git-Tag: 2.5.0-alpha2-ci-test-only~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b183073d5ae5285d417824ae39fd47fe7f816b8;p=thirdparty%2Fapache%2Fhttpd.git

check apr_sockaddr_info_get() return value
bz #66135


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

diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 0dc3917c85c..a63b09929b6 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -1555,7 +1555,12 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
                 }
 
                 /* make the connection */
-                apr_sockaddr_info_get(&pasv_addr, apr_psprintf(p, "%d.%d.%d.%d", h3, h2, h1, h0), connect_addr->family, pasvport, 0, p);
+                err = apr_sockaddr_info_get(&pasv_addr, apr_psprintf(p, "%d.%d.%d.%d", h3, h2, h1, h0), connect_addr->family, pasvport, 0, p);
+                if (APR_SUCCESS != err) {
+                    return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
+                                            "DNS lookup failure for: ",
+                                            connectname, NULL));
+                }
                 rv = apr_socket_connect(data_sock, pasv_addr);
                 if (rv != APR_SUCCESS) {
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01048)
@@ -1598,7 +1603,12 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
 #endif                          /* _OSD_POSIX */
         }
 
-        apr_sockaddr_info_get(&local_addr, local_ip, APR_UNSPEC, local_port, 0, r->pool);
+        err = apr_sockaddr_info_get(&local_addr, local_ip, APR_UNSPEC, local_port, 0, r->pool);
+        if (APR_SUCCESS != err) {
+            return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
+                                    "DNS lookup failure for: ",
+                                    connectname, NULL));
+        }
 
         if ((rv = apr_socket_bind(local_sock, local_addr)) != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01051)