From: David Vossel <dvossel@digium.com>
Date: Tue, 15 Sep 2009 19:27:21 +0000 (+0000)
Subject: Merged revisions 218687 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b40f9811cefbd65e6e4546a272af9e4661cf1fb;p=thirdparty%2Fasterisk.git

Merged revisions 218687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218687 | dvossel | 2009-09-15 14:22:37 -0500 (Tue, 15 Sep 2009) | 2 lines

  upward bound checking for port string to int conversion
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 30d5eecff8..3e979a46ad 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2686,7 +2686,7 @@ static int proxy_update(struct sip_proxy *proxy)
 static int port_str2int(const char *pt, unsigned int standard)
 {
 	int port = standard;
-	if (ast_strlen_zero(pt) || (sscanf(pt, "%30d", &port) != 1) || (port < 0)) {
+	if (ast_strlen_zero(pt) || (sscanf(pt, "%30d", &port) != 1) || (port < 1) || (port > 65535)) {
 		port = standard;
 	}