diff options
| author | Sean Bright <sean@malleable.com> | 2012-09-18 20:14:33 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-09-18 20:14:33 +0000 |
| commit | 54c531ff1c1f68465d27b6e66860405da717d175 (patch) | |
| tree | 9a66fbce7604b5655bc0ae9ea804fb23133bfb12 | |
| parent | f8d815e19f925c7122f4bf4ead01b0111336866a (diff) | |
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
| -rw-r--r-- | main/manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/manager.c b/main/manager.c index 9866e51fc..19c7b67ff 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] == ':') { |