← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/apache2/jaunty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/067_fix_segfault_in_ab.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-12-15 00:06:50 UTC
  • mfrom: (14.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20081215000650-5ovq2vvvrtmn5r1l
Tags: 2.2.11-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/{control, rules}: enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: add ufw profiles.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/067_fix_segfault_in_ab.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 067_fix_segfault_in_ab.dpatch by Ryan Niebur <ryanryan52@gmail.com>
 
3
##
 
4
## DP: Do not free what SSL_get_peer_cert_chain returns. It returns a
 
5
## pointer to memory that is freed later on with the
 
6
## session. (Bug#495982)
 
7
 
 
8
@DPATCH@
 
9
diff -urNad apache2-2.2.9~/support/ab.c apache2-2.2.9/support/ab.c
 
10
--- apache2-2.2.9~/support/ab.c 2008-05-28 05:58:01.000000000 -0700
 
11
+++ apache2-2.2.9/support/ab.c  2008-11-29 15:47:41.000000000 -0800
 
12
@@ -535,7 +535,6 @@
 
13
         for (i=1; i<count; i++) {
 
14
             cert = (X509 *)SK_VALUE(sk, i);
 
15
             ssl_print_cert_info(bio_out, cert);
 
16
-            X509_free(cert);
 
17
     }
 
18
     }
 
19
     cert = SSL_get_peer_certificate(c->ssl);