From: Sean Bright <sean@malleable.com>
Date: Tue, 18 Sep 2012 20:14:33 +0000 (+0000)
Subject: Don't crash when passing a NULL message to __astman_get_header.
X-Git-Tag: 13.0.0-beta1~2534
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54c531ff1c1f68465d27b6e66860405da717d175;p=thirdparty%2Fasterisk.git

Don't crash when passing a NULL message to __astman_get_header.

Before this commit, __astman_get_header would blindly dereference the passed in
'struct message *' to traverse the header list.  There are cases, however, such
as '*CLI> sip qualify peer foo' where the message pointer is NULL, so we need
to check for that.
........

Merged revisions 373131 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373132 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 373133 from http://svn.asterisk.org/svn/asterisk/branches/11


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

diff --git a/main/manager.c b/main/manager.c
index 9866e51fc4..19c7b67fff 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1935,6 +1935,10 @@ static const char *__astman_get_header(const struct message *m, char *var, int m
 	int x, l = strlen(var);
 	const char *result = "";
 
+	if (!m) {
+		return result;
+	}
+
 	for (x = 0; x < m->hdrcount; x++) {
 		const char *h = m->headers[x];
 		if (!strncasecmp(var, h, l) && h[l] == ':') {