upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-07-15 10:10:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: usr: Stop delv from aborting on a malformed query name

Browse source 
delv aborts with SIGABRT instead of exiting cleanly when given a query
name that fails wire-format conversion (e.g. a label longer than 63
octets). After this change delv prints the parse error and exits with
a normal failure code.

Closes #5916

Merge branch '5916-delv-run-resolve-null-detach-abort' into 'main'

See merge request isc-projects/bind9!11921
This commit is contained in:
Ondřej Surý 2026-04-30 10:56:18 +02:00
commit ddf6239534
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/delv/delv.c
View file

@ -1911,7 +1911,9 @@ cleanup:
isc_mem_put(isc_g_mctx, namelist, sizeof(*namelist));
isc_loopmgr_shutdown();
dns_client_detach(&client);
if (client != NULL) {
dns_client_detach(&client);
}
}
static void

12
bin/tests/system/digdelv/tests.sh
View file

@ -1533,6 +1533,18 @@ if [ -x "$DELV" ]; then
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
n=$((n + 1))
echo_i "checking delv exits cleanly on malformed query name ($n)"
ret=0
longlabel="$(printf 'a%.0s' $(seq 1 64))"
delv_with_opts @10.53.0.3 -t a "$longlabel.example.com" >delv.out.test$n 2>&1
rc=$?
# Pre-fix: SIGABRT (exit 134) from dns_client_detach(NULL) in run_resolve cleanup.
[ $rc -eq 134 ] && ret=1
grep "label too long" delv.out.test$n >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
n=$((n + 1))
echo_i "checking delv with IPv6 on IPv4 does not work ($n)"
if testsock6 fd92:7065:b8e:ffff::3 2>/dev/null; then