diff options
| author | Guenter Knauf <fuankg@apache.org> | 2013-02-07 16:35:31 +0100 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2013-02-07 16:35:31 +0100 |
| commit | bf4e43b340f4fc57c6c67470ba4644413d2af475 (patch) | |
| tree | fcca77b65c863adacbecf1643eb6daf5cadc0b9b /modules | |
| parent | Style fixes - no code changes. (diff) | |
| download | apache2-bf4e43b340f4fc57c6c67470ba4644413d2af475.tar.xz apache2-bf4e43b340f4fc57c6c67470ba4644413d2af475.zip | |
Fixed a potential NULL pointer deference.
This was brought up on dev list by Christophe Jaillet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1443558 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/arch/netware/mod_nw_ssl.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c index 652bc62967..a6e15e7f0c 100644 --- a/modules/arch/netware/mod_nw_ssl.c +++ b/modules/arch/netware/mod_nw_ssl.c @@ -1165,6 +1165,14 @@ static apr_status_t ssl_io_filter_Upgrade(ap_filter_t *f, */ ap_remove_output_filter(f); + if (!r) { + /* + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02131) + "Unable to get upgradeable socket handle"); + */ + return ap_pass_brigade(f->next, bb); + } + /* No need to ensure that this is a server with optional SSL, the filter * is only inserted if that is true. */ @@ -1178,15 +1186,8 @@ static apr_status_t ssl_io_filter_Upgrade(ap_filter_t *f, apr_table_unset(r->headers_out, "Upgrade"); - if (r) { - csd_data = (secsocket_data*)ap_get_module_config(r->connection->conn_config, &nwssl_module); - csd = csd_data->csd; - } - else { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, APLOGNO(02131) - "Unable to get upgradeable socket handle"); - return ap_pass_brigade(f->next, bb); - } + csd_data = (secsocket_data*)ap_get_module_config(r->connection->conn_config, &nwssl_module); + csd = csd_data->csd; /* Send the interim 101 response. */ upgradebb = apr_brigade_create(r->pool, f->c->bucket_alloc); |