From c46807e9c3761d83a4b62d3c2a5c3e3900668734 Mon Sep 17 00:00:00 2001
From: Marc Bradshaw <marc@marcbradshaw.net>
Date: Wed, 18 Sep 2024 02:37:08 +0000
Subject: [PATCH] Fix issue where certain DNS results would cause an exception
 to be thrown

---
 lib/Mail/SPF/Server.pm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/Mail/SPF/Server.pm b/lib/Mail/SPF/Server.pm
index 159ec34..d949bef 100644
--- a/lib/Mail/SPF/Server.pm
+++ b/lib/Mail/SPF/Server.pm
@@ -582,15 +582,12 @@ sub dns_lookup {
 
     # Throw DNS exception unless an answer packet with RCODE 0 or 3 (NXDOMAIN)
     # was received (thereby treating NXDOMAIN as an acceptable but empty answer packet):
-    defined $self->dns_resolver->errorstring and $self->dns_resolver->errorstring !~ /^(timeout|query timed out)$/
-        or throw Mail::SPF::EDNSTimeout(
-            "Time-out on DNS '$rr_type' lookup of '$domain'");
-    defined($packet)
-        or throw Mail::SPF::EDNSError(
-            "Unknown error on DNS '$rr_type' lookup of '$domain'");
-    $packet->header->rcode =~ /^(NOERROR|NXDOMAIN)$/
-        or throw Mail::SPF::EDNSError(
-            "'" . $packet->header->rcode . "' error on DNS '$rr_type' lookup of '$domain'");
+    throw Mail::SPF::EDNSTimeout("Time-out on DNS '$rr_type' lookup of '$domain'")
+      if defined $self->dns_resolver->errorstring && $self->dns_resolver->errorstring =~ /^(timeout|query timed out)$/;
+    throw Mail::SPF::EDNSError("Unknown error on DNS '$rr_type' lookup of '$domain'")
+      unless defined $packet;
+    throw Mail::SPF::EDNSError("'" . $packet->header->rcode . "' error on DNS '$rr_type' lookup of '$domain'")
+      unless $packet->header->rcode =~ /^(NOERROR|NXDOMAIN)$/;
 
     return $packet;
 }