From: Jelte Jansen <jeltejan@NLnetLabs.nl>
Date: Fri, 10 Jun 2005 09:49:46 +0000 (+0000)
Subject: fixed mx.c segfault
X-Git-Tag: release-0.65~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7a13934bb6a2fd2c7ff7c74926d093307300bb6;p=thirdparty%2Fldns.git

fixed mx.c segfault
---

diff --git a/packet.c b/packet.c
index 6ef913e0..80e48be4 100644
--- a/packet.c
+++ b/packet.c
@@ -267,7 +267,6 @@ ldns_pkt_rr_list_by_type(ldns_pkt *packet, ldns_rr_type type, ldns_pkt_section s
 {
 	ldns_rr_list *rrs;
 	ldns_rr_list *new;
-	ldns_rr_list *ret;
 	uint16_t i;
 
 	if(!packet) {
@@ -276,8 +275,7 @@ ldns_pkt_rr_list_by_type(ldns_pkt *packet, ldns_rr_type type, ldns_pkt_section s
 	
 	rrs = ldns_pkt_get_section(packet, sec);
 	new = ldns_rr_list_new();
-	ret = NULL;
-
+	
 	for(i = 0; i < ldns_rr_list_rr_count(rrs); i++) {
 		if (type == ldns_rr_get_type(ldns_rr_list_rr(rrs, i))) {
 			/* types match */
@@ -285,17 +283,14 @@ ldns_pkt_rr_list_by_type(ldns_pkt *packet, ldns_rr_type type, ldns_pkt_section s
 			                     ldns_rr_clone(
 			                     	ldns_rr_list_rr(rrs, i))
 					     );
-			if (ret) {
-				ldns_rr_list_free(ret);
-			}
-			ret = new;
 		}
 	}
-	if (!ret) { 
-		ldns_rr_list_deep_free(new);
+	if (ldns_rr_list_rr_count(new) == 0) {
+		ldns_rr_list_free(new);
+		return NULL;
+	} else {
+		return new;
 	}
-
-	return ret;
 }
 
 /* return only those rrs that share name and type */