(closes issue #12362) [redo of 113012]

This fixes a for loop (in realtime_peer) to check all the ast_variables the loop was intending to test rather than just the first one. The change exposed the problem of calling memcpy on a NULL pointer, in this case the passed in sockaddr_in struct which is now checked.

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fe89d973005834ead4711eb41b9bbe34ee204019..b0e2108ae22a58e96b835b27dc542352588ba888 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2539,9 +2539,9 @@ static struct sip_peer *realtime_peer(const char *newpeername, struct sockaddr_i
                         * is because we only have the IP address and the host field might be
                         * set as a name (and the reverse PTR might not match).
                         */
-                       if (var) {
+                       if (var && sin) {
                                for (tmp = var; tmp; tmp = tmp->next) {
-                                       if (!strcasecmp(var->name, "host")) {
+                                       if (!strcasecmp(tmp->name, "host")) {
                                                struct hostent *hp;
                                                struct ast_hostent ahp;
                                                if (!(hp = ast_gethostbyname(tmp->value, &ahp)) || (memcmp(&hp->h_addr, &sin->sin_addr, sizeof(hp->h_addr)))) {