From: Matthew Jordan <mjordan@digium.com>
Date: Sun, 14 Jul 2013 02:05:04 +0000 (+0000)
Subject: Remove redundant code in dns.c
X-Git-Tag: 13.0.0-beta1~1495
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=583226dc5e11efe441f5371807b189cf4e07784a;p=thirdparty%2Fasterisk.git

Remove redundant code in dns.c

Peter J Philipp pointed out that there are two checks that ensure that len is
not less than 0. If len is less than 0, the function returns. Having both of
them is clearly redundant.

This removes the second and attempts to clarify (slightly) the error condition.

(closes issue ASTERISK-21772)
Reported by: Peter J Philipp


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/dns.c b/main/dns.c
index c507d5a58c..d5682758e3 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -225,11 +225,7 @@ static int dns_parse_answer(void *context,
 		answer += sizeof(struct dn_answer);
 		len -= sizeof(struct dn_answer);
 		if (len < 0) {
-			ast_log(LOG_WARNING, "Strange result size\n");
-			return -1;
-		}
-		if (len < 0) {
-			ast_log(LOG_WARNING, "Length exceeds frame\n");
+			ast_log(LOG_WARNING, "Length of DNS answer exceeds frame\n");
 			return -1;
 		}