Merged revisions 249405 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r249405 | tilghman | 2010-02-28 01:10:22 -0600 (Sun, 28 Feb 2010) | 2 lines
  
  Properly document voicemail API documents.  Also fix a crash reported via the -dev list.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@249406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-02-28 07:13:39 +00:00
parent 23fcfd1d29
commit 47f49a88fb
2 changed files with 33 additions and 8 deletions

View File

@@ -4807,7 +4807,7 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i
static int messagecount(const char *context, const char *mailbox, const char *folder)
{
return __has_voicemail(context, mailbox, folder, 0) + (strcmp(folder, "INBOX") ? 0 : __has_voicemail(context, mailbox, "Urgent", 0));
return __has_voicemail(context, mailbox, folder, 0) + (folder && strcmp(folder, "INBOX") ? 0 : __has_voicemail(context, mailbox, "Urgent", 0));
}
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit)