X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bb6a0f57e5c1a04c9c191af6a37184970003b1c2..b94ea1bd61485a97c2d0dc2cab4c4d86ffe82e89:/src/src/lookups/dnsdb.c

diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index 35a946447..fcf80e3dd 100644
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -452,20 +452,20 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
 	switch (type)
 	  {
 	  case T_MXH:
-	    if (rr->size < sizeof(u_int16_t)) continue;
+	    if (rr_bad_size(rr, sizeof(u_int16_t))) continue;
 	    /* mxh ignores the priority number and includes only the hostnames */
 	    GETSHORT(priority, p);
 	    break;
 
 	  case T_MX:
-	    if (rr->size < sizeof(u_int16_t)) continue;
+	    if (rr_bad_size(rr, sizeof(u_int16_t))) continue;
 	    GETSHORT(priority, p);
 	    sprintf(CS s, "%d%c", priority, *outsep2);
 	    yield = string_cat(yield, s);
 	    break;
 
 	  case T_SRV:
-	    if (rr->size < 3*sizeof(u_int16_t)) continue;
+	    if (rr_bad_size(rr, 3*sizeof(u_int16_t))) continue;
 	    GETSHORT(priority, p);
 	    GETSHORT(weight, p);
 	    GETSHORT(port, p);
@@ -475,7 +475,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
 	    break;
 
 	  case T_CSA:
-	    if (rr->size < 3*sizeof(u_int16_t)) continue;
+	    if (rr_bad_size(rr, 3*sizeof(u_int16_t))) continue;
 	    /* See acl_verify_csa() for more comments about CSA. */
 	    GETSHORT(priority, p);
 	    GETSHORT(weight, p);
@@ -542,7 +542,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
 	  else yield = string_cat(yield, s);
 
 	  p += rc;
-	  if (rr->size >= p - rr->data - 5*sizeof(u_int32_t))
+	  if (!rr_bad_increment(rr, p, 5 * sizeof(u_int32_t)))
 	    {
 	    GETLONG(serial, p); GETLONG(refresh, p);
 	    GETLONG(retry,  p); GETLONG(expire,  p); GETLONG(minimum, p);