From 9210482be7696f64836cf04e52ba6e2945ab5ca3 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Wed, 23 Apr 2014 14:02:30 -0400
Subject: [PATCH] iax2: prevent possible null pointer dereferences
Refs #46004
Change-Id: I15796bca88d6997cf75ed7616ff1af207401631b
---
daemon/libs/iax2/iax.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/libs/iax2/iax.c b/daemon/libs/iax2/iax.c
index 34e4938d8e..7e23378a8b 100644
--- a/daemon/libs/iax2/iax.c
+++ b/daemon/libs/iax2/iax.c
@@ -499,7 +499,7 @@ int iax_get_netstats(struct iax_session *session, int *rtt, struct iax_netstat *
{
jb_info stats;
- if(!iax_session_valid(session)) return -1;
+ if(!session || !iax_session_valid(session)) return -1;
*rtt = session->pingtime;
@@ -1848,7 +1848,7 @@ static void send_ping(void *s)
struct iax_session *session = (struct iax_session *)s;
/* important, eh? */
- if(!iax_session_valid(session)) return;
+ if(!session || !iax_session_valid(session)) return;
send_command(session, AST_FRAME_IAX, IAX_COMMAND_PING, 0, NULL, 0, -1);
session->pingid = iax_sched_add(NULL,NULL, send_ping, (void *)session, ping_time * 1000);
--
GitLab