aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-20 17:29:11 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-20 17:29:11 +0000
commit2b081a23b8ed6442e2c7c5f36842d8e1b83a9525 (patch)
treee549d5ebafce0e3a567c1ce66b2cc473ec03729f
parente66c300aaf5768c93ee58d81de68aaf9df23a188 (diff)
Fix a couple of places where it's possible to dereference a NULL pointer.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@94214 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_iax2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index b52c1acd4..e4d826798 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2629,7 +2629,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
if (peername) {
var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
- if (!var)
+ if (!var && sin)
var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
} else if (sin) {
char porta[25];
@@ -2646,7 +2646,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
}
}
}
- if (!var) { /* Last ditch effort */
+ if (!var && peername) { /* Last ditch effort */
var = ast_load_realtime("iaxpeers", "name", peername, NULL);
/*!\note
* If this one loaded something, then we need to ensure that the host