head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.62
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.60
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.58
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.56
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.54
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.52
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.50
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.48
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.46
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.44
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.42
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.40
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.38
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.36
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.34
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.32
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.30
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.28
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.26
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.24
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.22
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.20
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.18
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.16
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.12
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.14
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.10
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.8
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.6
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2
	pkgsrc-2018Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2018.09.28.20.36.24;	author schmonz;	state Exp;
branches;
next	;
commitid	R9q4qBimG5IyCUTA;


desc
@@


1.1
log
@Rename 'djbdns-qmerge2' option to 'djbdns-mergequeries', still enabled
by default. Deprecate 'djbdns-qmerge1'.

When applying the 'djbdns-mergequeries' patch, also apply a missing
bounds check. Patch from Tim Stewart on dns@@list.cr.yp.to.

Bump PKGREVISION.
@
text
@$NetBSD$

Add a missing bounds check to the MERGEQUERIES patch's try_merge().
From Tim Stewart in <https://marc.info/?l=djbdns&m=153020962703821>

--- dns_transmit.c.orig	2018-09-28 20:25:42.000000000 +0000
+++ dns_transmit.c
@@@@ -35,6 +35,7 @@@@ static int try_merge(struct dns_transmit
   for (i = 0; i < MAXUDP; i++) {
     if (!inprogress[i]) continue;
     if (!merge_equal(d, inprogress[i])) continue;
+    if (inprogress[i]->nslaves == MAXUDP) continue;
     d->master = inprogress[i];
     inprogress[i]->slaves[inprogress[i]->nslaves++] = d;
     return 1;
@@@@ -127,8 +128,10 @@@@ static void mergefree(struct dns_transmi
   }
   /* and unregister all of our slaves from us */
   for (i = 0; i < d->nslaves; i++) {
-    if (d->slaves[i])
+    if (d->slaves[i]) {
       d->slaves[i]->master = NULL;
+      d->slaves[i] = 0;
+    }
   }
   d->nslaves = 0;
 }
@