fix numtrunc in str2wire.c and rrdef.c

NLnetLabs · Jul 17, 2023 · 1ac12f7 · 1ac12f7
1 parent 221a792
commit 1ac12f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sldns/rrdef.c b/sldns/rrdef.c
@@ -702,10 +702,12 @@ sldns_get_rr_type_by_name(const char *name)
 
 	/* TYPEXX representation */
 	if (strlen(name) > 4 && strncasecmp(name, "TYPE", 4) == 0) {
-            unsigned int a = atoi(name + 4);
-            assert(a <= LDNS_RR_TYPE_LAST);
-            return a;
+        unsigned int a = atoi(name + 4);
+        if (a > LDNS_RR_TYPE_LAST) {
+            return (enum sldns_enum_rr_type)0;
         }
+	    return a;
+	}
 
 	/* Normal types */
 	for (i = 0; i < (unsigned int) LDNS_RDATA_FIELD_DESCRIPTORS_COUNT; i++) {

diff --git a/smallapp/unbound-host.c b/smallapp/unbound-host.c
@@ -186,7 +186,7 @@ massage_type(const char* t, int reverse, int* multi)
 	if(t) {
 		int r = sldns_get_rr_type_by_name(t);
 		if(r == 0 && strcasecmp(t, "TYPE0") != 0 && 
-			strcmp(t, "") != 0) {
+		        strcmp(t, "") != 0) {
 			fprintf(stderr, "error unknown type %s\n", t);
 			exit(1);
 		}