diff options
| author | Mark Murawki <markm@intellasoft.net> | 2011-05-26 20:16:28 +0000 |
|---|---|---|
| committer | Mark Murawki <markm@intellasoft.net> | 2011-05-26 20:16:28 +0000 |
| commit | 0648d9595bb5b00cb2b5ef362cb24691ad2e4ae2 (patch) | |
| tree | 4173d9e36e0d0e82bbb1fbba194289d9a12adf95 /main/netsock2.c | |
| parent | 74ba3af20119e561873e9bd491798e5b6975f07a (diff) | |
Merged revisions 321100 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r321100 | markm | 2011-05-26 16:09:35 -0400 (Thu, 26 May 2011) | 11 lines
ast_sockaddr_resolve() in netsock2.c may deref a null pointer
Added a null check in netsock2 ast_sockaddr_resolve() as well as added default initalizers in chan_sip parse_uri_legacy_check() to make sure that invalid uris will make null (and not undefined) user,pass,domain,transport variables
(closes issue #19346)
Reported by: kobaz
Patches:
netsock2.patch uploaded by kobaz (license 834)
Tested by: kobaz, Marquis
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock2.c')
| -rw-r--r-- | main/netsock2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/netsock2.c b/main/netsock2.c index 6f55b3b3b..25f15a2fc 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -232,6 +232,10 @@ int ast_sockaddr_resolve(struct ast_sockaddr **addrs, const char *str, char *s, *host, *port; int e, i, res_cnt; + if (!str) { + return 0; + } + s = ast_strdupa(str); if (!ast_sockaddr_split_hostport(s, &host, &port, flags)) { return 0; |