From: Corey Farrell <git@cfware.com>
Date: Tue, 19 Dec 2017 05:17:08 +0000 (-0500)
Subject: core: Fix multiple trivial issues in the core.
X-Git-Tag: 15.2.0-rc1~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bfa85447f1a580805436ee77ed6261bcf9d2db0;p=thirdparty%2Fasterisk.git

core: Fix multiple trivial issues in the core.

* Fix small leaks in from error conditions in sdp.c and translate.c.
* Check new file descriptor is less than 0, not less than or equal.

Change-Id: Id7782775486175c739e0c4bf3ea5e17e3f452a99
---

diff --git a/main/sdp.c b/main/sdp.c
index bfb83e82fe..010f9d9027 100644
--- a/main/sdp.c
+++ b/main/sdp.c
@@ -791,6 +791,7 @@ static struct ast_stream *get_stream_from_m(const struct ast_sdp_m_line *m_line,
 			rtp_codecs_free(codecs);
 			ast_stream_free(stream);
 			ao2_ref(caps, -1);
+			ast_free(codecs);
 			return NULL;
 		}
 
diff --git a/main/translate.c b/main/translate.c
index ce4745ce0e..02717c5ed1 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -497,6 +497,7 @@ struct ast_trans_pvt *ast_translator_build_path(struct ast_format *dst, struct a
 			ast_log(LOG_WARNING, "No translator path from %s to %s\n",
 				ast_format_get_name(src), ast_format_get_name(dst));
 			AST_RWLIST_UNLOCK(&translators);
+			ast_translator_free_path(head);
 			return NULL;
 		}
 		if ((t->dst_codec.sample_rate == ast_format_get_sample_rate(dst)) && (t->dst_codec.type == ast_format_get_type(dst))) {
@@ -505,9 +506,7 @@ struct ast_trans_pvt *ast_translator_build_path(struct ast_format *dst, struct a
 		if (!(cur = newpvt(t, explicit_dst))) {
 			ast_log(LOG_WARNING, "Failed to build translator step from %s to %s\n",
 				ast_format_get_name(src), ast_format_get_name(dst));
-			if (head) {
-				ast_translator_free_path(head);
-			}
+			ast_translator_free_path(head);
 			AST_RWLIST_UNLOCK(&translators);
 			return NULL;
 		}
diff --git a/main/utils.c b/main/utils.c
index a070da49fb..490961320b 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -2624,7 +2624,7 @@ void ast_set_default_eid(struct ast_eid *eid)
 	unsigned char full_mac[6]  = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
 	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s <= 0) {
+	if (s < 0) {
 		ast_log(LOG_WARNING, "Unable to open socket for seeding global EID. "
 			"You will have to set it manually.\n");
 		return;