svn commit: r363186 - stable/11/contrib/ldns/drill
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Tue Jul 14 17:46:41 UTC 2020
Author: gonzo
Date: Tue Jul 14 17:46:40 2020
New Revision: 363186
URL: https://svnweb.freebsd.org/changeset/base/363186
Log:
MFC r362516:
Fix crash in drill(1) when IP has two subsequent dots
Cherry-pick crash fix from the upstream repo
PR: 226575
Reported by: Goran Mekić <meka at tilda.center>
Obtained from: https://git.nlnetlabs.nl/ldns/commit/?id=98291475
Modified:
stable/11/contrib/ldns/drill/drill.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/contrib/ldns/drill/drill.c
==============================================================================
--- stable/11/contrib/ldns/drill/drill.c Tue Jul 14 17:23:25 2020 (r363185)
+++ stable/11/contrib/ldns/drill/drill.c Tue Jul 14 17:46:40 2020 (r363186)
@@ -747,15 +747,17 @@ main(int argc, char *argv[])
free(name2);
} else {
qname = ldns_dname_new_frm_str(name);
- qname_tmp = ldns_dname_reverse(qname);
- ldns_rdf_deep_free(qname);
- qname = qname_tmp;
- qname_tmp = ldns_dname_new_frm_str("in-addr.arpa.");
- status = ldns_dname_cat(qname, qname_tmp);
- if (status != LDNS_STATUS_OK) {
- error("%s", "could not create reverse address for ip4: %s\n", ldns_get_errorstr_by_id(status));
+ if (qname) {
+ qname_tmp = ldns_dname_reverse(qname);
+ ldns_rdf_deep_free(qname);
+ qname = qname_tmp;
+ qname_tmp = ldns_dname_new_frm_str("in-addr.arpa.");
+ status = ldns_dname_cat(qname, qname_tmp);
+ if (status != LDNS_STATUS_OK) {
+ error("%s", "could not create reverse address for ip4: %s\n", ldns_get_errorstr_by_id(status));
+ }
+ ldns_rdf_deep_free(qname_tmp);
}
- ldns_rdf_deep_free(qname_tmp);
}
if (!qname) {
error("%s", "-x implies an ip address");
More information about the svn-src-stable
mailing list