source: mod_gnutls/debian/patches/proxy-segfault-fix.patch @ 2db6923

debian/masterdebian/stretch-backportsjessie-backports
Last change on this file since 2db6923 was 2db6923, checked in by Daniel Kahn Gillmor <dkg@…>, 5 years ago

refresh patches with gbp pq

  • Property mode set to 100644
File size: 1.1 KB
RevLine 
[8ed8e96]1From: Thomas Klute <thomas2.klute@uni-dortmund.de>
2Date: Tue, 13 Jan 2015 17:04:38 +0100
[2db6923]3Subject: Check if filters exist before removing them in ssl_engine_disable
[8ed8e96]4
5Trying to remove filters that are NULL leads to a segfault in the worker
6thread. Check if c->input_filters and c->output_filters are defined
7before removing and remove only if set.
8
9Also, output filters should be removed with the dedicated function.
10---
11 src/mod_gnutls.c | 6 ++++--
12 1 file changed, 4 insertions(+), 2 deletions(-)
13
[2db6923]14diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
15index e576fb8..0a32ffd 100644
[8ed8e96]16--- a/src/mod_gnutls.c
17+++ b/src/mod_gnutls.c
[2db6923]18@@ -80,8 +80,10 @@ int ssl_engine_disable(conn_rec *c) {
[8ed8e96]19     if(sc->enabled == GNUTLS_ENABLED_FALSE) {
20         return 1;
21     }
22-    ap_remove_input_filter(c->input_filters);
23-    ap_remove_input_filter(c->output_filters);
24+    if (c->input_filters)
25+        ap_remove_input_filter(c->input_filters);
26+    if (c->output_filters)
27+        ap_remove_output_filter(c->output_filters);
28     mgs_cleanup_pre_config(c->pool);
29     sc->enabled = 0;
30     return 1;
Note: See TracBrowser for help on using the repository browser.