Changeset 885

Timestamp:

05/22/25 16:36:01 (2 weeks ago)

Author:

Kris Deugau

Message:

/trunk

Catch a rare edge case where a DNSDB.pm caller to addRec() or updateRec()
forgets to pass a value (or passes an invalid one) for $expires, but passes
a value for $stamp. This fix catches the error instead of letting it fall
down to Postgres. Spotted by Jawala Birdi.

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -4740 +4740 @@
   return ('FAIL', "val must contain a value") if !$$val;
 
+  return ('FAIL', "expires must be 1, 't', or 'until',  or 0, 'f', or 'after'")
+        if ($stamp && !$expires)
+        || ($stamp && $expires ne '0' && $expires ne '1' && $expires ne 't' && $expires ne 'f');
+
   # Spaces are evil.
   $$host =~ s/^\s+//;
@@ -4895 +4899 @@
   # just set it to an empty string;  failures will be caught later.
   $$host = '' if !$$host;
+
+  return ('FAIL', "expires must be 1, 't', or 'until',  or 0, 'f', or 'after'")
+        if ($stamp && !$expires)
+        || ($stamp && $expires ne '0' && $expires ne '1' && $expires ne 't' && $expires ne 'f');
 
   # Spaces are evil.