Merged revisions 302837 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 19 Jan 2011 23:57:27 +0000 (23:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 19 Jan 2011 23:57:27 +0000 (23:57 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302837 | russell | 2011-01-19 17:56:48 -0600 (Wed, 19 Jan 2011) | 2 lines

  Only check container count if it exists.
........

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

main/manager.c

index 1c8479f..896c7b8 100644 (file)
@@ -4781,7 +4781,7 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount
        struct ast_str *buf;
        int i;
 
-       if (!ao2_container_count(sessions) && AST_RWLIST_EMPTY(&manager_hooks)) {
+       if (!(sessions && ao2_container_count(sessions)) && AST_RWLIST_EMPTY(&manager_hooks)) {
                return 0;
        }