domain: handle too-short URI RRs correctly.

Just report the problem and drive on, not trying to print the contents. (cherry picked from commit 63f7206)
aosp-mirror · Feb 29, 2024 · 1f563c1 · 1f563c1
1 parent 93b107b
commit 1f563c1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/print-domain.c b/print-domain.c
@@ -839,7 +839,10 @@ ns_rprint(netdissect_options *ndo,
 	case T_URI:
 		if (!ND_TTEST_LEN(cp, len))
 			return(NULL);
-		ND_ICHECK_U(len, <, 4);
+		if (len < 4) {
+			ND_PRINT(" len %u is too short (< 4)", len);
+			break;
+		}
 		ND_PRINT(" %u %u ", GET_BE_U_2(cp), GET_BE_U_2(cp + 2));
 		if (nd_printn(ndo, cp + 4, len - 4, ndo->ndo_snapend))
 			return(NULL);
@@ -895,8 +898,6 @@ ns_rprint(netdissect_options *ndo,
 	    }
 	}
 	return (rp);		/* XXX This isn't always right */
-invalid:
-	nd_print_invalid(ndo);
 }
 
 void