From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Mon, 14 Feb 2005 13:48:16 +0000 (+0000)
Subject: fixed possible segfault
X-Git-Tag: release-0.50~434
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=216ac7f20f69731f258c45b3e569a8e93cbcafe3;p=thirdparty%2Fldns.git

fixed possible segfault
added "\# <size" to unknown rrtype 2str
---

diff --git a/TODO b/TODO
index 4a5e9ac2..9f9404e4 100644
--- a/TODO
+++ b/TODO
@@ -11,6 +11,8 @@ o network code
 	- tcp
 	- axfr
 	- tsig?
+	- timeouts part of resolver struct with access functions and
+	  sane default values
 o DNSSEC
 o Make a shared library and test compile some programs
 
diff --git a/host2str.c b/host2str.c
index 94fabc55..da5cc777 100644
--- a/host2str.c
+++ b/host2str.c
@@ -395,6 +395,13 @@ ldns_rdf2buffer_str_loc(ldns_buffer *output, ldns_rdf *rdf)
 	}
 }
 
+ldns_status
+ldns_rdf2buffer_str_unknown(ldns_buffer *output, ldns_rdf *rdf)
+{
+	ldns_buffer_printf(output, "\\# %u ", ldns_rdf_size(rdf));
+	return ldns_rdf2buffer_str_hex(output, rdf);
+}
+
 ldns_status
 ldns_rdf2buffer_str_nsap(ldns_buffer *output, ldns_rdf *rdf)
 {
@@ -648,79 +655,81 @@ ldns_status
 ldns_rdf2buffer_str(ldns_buffer *buffer, ldns_rdf *rdf)
 {
 	ldns_status res;
-	
-	switch(ldns_rdf_get_type(rdf)) {
-	case LDNS_RDF_TYPE_NONE:
-		break;
-	case LDNS_RDF_TYPE_DNAME:
-		res = ldns_rdf2buffer_str_dname(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_INT8:
-		res = ldns_rdf2buffer_str_int8(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_INT16:
-		res = ldns_rdf2buffer_str_int16(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_INT32:
-		res = ldns_rdf2buffer_str_int32(buffer, rdf);
-		break;
-        case LDNS_RDF_TYPE_TSIGTIME:
-                res = ldns_rdf2buffer_str_tsigtime(buffer, rdf);
-                break;
-	case LDNS_RDF_TYPE_A:
-		res = ldns_rdf2buffer_str_a(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_AAAA:
-		res = ldns_rdf2buffer_str_aaaa(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_STR:
-		res = ldns_rdf2buffer_str_str(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_APL:
-		res = ldns_rdf2buffer_str_apl(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_B64:
-		res = ldns_rdf2buffer_str_b64(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_HEX:
-		res = ldns_rdf2buffer_str_hex(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_NSEC: 
-		res = ldns_rdf2buffer_str_nsec(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_TYPE: 
-		res = ldns_rdf2buffer_str_type(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_CLASS:
-		res = ldns_rdf2buffer_str_class(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_CERT:
-		res = ldns_rdf2buffer_str_cert(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_ALG:
-		res = ldns_rdf2buffer_str_alg(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_UNKNOWN:
-		res = ldns_rdf2buffer_str_hex(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_TIME:
-		res = ldns_rdf2buffer_str_time(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_LOC:
-		res = ldns_rdf2buffer_str_loc(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_WKS:
-		res = ldns_rdf2buffer_str_wks(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_NSAP:
-		res = ldns_rdf2buffer_str_nsap(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_IPSECKEY:
-		res = ldns_rdf2buffer_str_ipseckey(buffer, rdf);
-		break;
-	case LDNS_RDF_TYPE_SERVICE:
-		/* XXX todo */
-		break;
+
+	if (rdf) {
+		switch(ldns_rdf_get_type(rdf)) {
+		case LDNS_RDF_TYPE_NONE:
+			break;
+		case LDNS_RDF_TYPE_DNAME:
+			res = ldns_rdf2buffer_str_dname(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_INT8:
+			res = ldns_rdf2buffer_str_int8(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_INT16:
+			res = ldns_rdf2buffer_str_int16(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_INT32:
+			res = ldns_rdf2buffer_str_int32(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_TSIGTIME:
+			res = ldns_rdf2buffer_str_tsigtime(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_A:
+			res = ldns_rdf2buffer_str_a(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_AAAA:
+			res = ldns_rdf2buffer_str_aaaa(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_STR:
+			res = ldns_rdf2buffer_str_str(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_APL:
+			res = ldns_rdf2buffer_str_apl(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_B64:
+			res = ldns_rdf2buffer_str_b64(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_HEX:
+			res = ldns_rdf2buffer_str_hex(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_NSEC: 
+			res = ldns_rdf2buffer_str_nsec(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_TYPE: 
+			res = ldns_rdf2buffer_str_type(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_CLASS:
+			res = ldns_rdf2buffer_str_class(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_CERT:
+			res = ldns_rdf2buffer_str_cert(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_ALG:
+			res = ldns_rdf2buffer_str_alg(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_UNKNOWN:
+			res = ldns_rdf2buffer_str_unknown(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_TIME:
+			res = ldns_rdf2buffer_str_time(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_LOC:
+			res = ldns_rdf2buffer_str_loc(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_WKS:
+			res = ldns_rdf2buffer_str_wks(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_NSAP:
+			res = ldns_rdf2buffer_str_nsap(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_IPSECKEY:
+			res = ldns_rdf2buffer_str_ipseckey(buffer, rdf);
+			break;
+		case LDNS_RDF_TYPE_SERVICE:
+			/* XXX todo */
+			break;
+		}
 	}
 
 	return LDNS_STATUS_OK;