← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to debian/patches/17-CVE-2010-2951.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/17-CVE-2010-2951.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 17-CVE-2010-2951.dpatch by Stephen Thorne <stephen@thorne.id.au>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: Bug 3021: Large DNS reply causes crash when no ipv6 resolver present
6
 
 
7
 
@DPATCH@
8
 
 
9
 
--- a/src/dns_internal.cc
10
 
+++ b/src/dns_internal.cc
11
 
@@ -843,14 +843,16 @@
12
 
 
13
 
     } while ( (x<0 && y<0) && q->nsends % nns != 0);
14
 
 
15
 
-    if (y >= 0) {
16
 
-        fd_bytes(DnsSocketB, y, FD_WRITE);
17
 
-        commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0);
18
 
-    }
19
 
+    if (!q->need_vc) {
20
 
+        if (y >= 0) {
21
 
+            fd_bytes(DnsSocketB, y, FD_WRITE);
22
 
+            commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0);
23
 
+        }
24
 
 
25
 
-    if (x >= 0) {
26
 
-        fd_bytes(DnsSocketA, x, FD_WRITE);
27
 
-        commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
28
 
+        if (x >= 0) {
29
 
+            fd_bytes(DnsSocketA, x, FD_WRITE);
30
 
+            commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
31
 
+        }
32
 
     }
33
 
 
34
 
     nameservers[ns].nqueries++;