diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-05-15 15:13:11 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-05-15 15:13:11 +0000 |
| commit | f10440a35f549476a186ff5e66e3c241baeb767e (patch) | |
| tree | b6d8a5d8d5231d5f30a65df91f80e165d2b8393e /apps | |
| parent | 18065a175d5012a4f1033e8c05c064007494ed3c (diff) | |
Prevent crashes from occurring due to a strcmp of a NULL pointer.
(closes issue #12661)
Reported by: jaroth
Patches:
urgentcompare.patch uploaded by jaroth (license 50)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@116590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 9dd739589..8a0ebabbc 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3450,7 +3450,7 @@ static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int i ast_log(AST_LOG_NOTICE, "Copying message from %s@%s to %s@%s\n", vmu->mailbox, vmu->context, recip->mailbox, recip->context); - if (!strcmp(flag, "Urgent")) { /* If urgent, copy to Urgent folder */ + if (!ast_strlen_zero(flag) && !strcmp(flag, "Urgent")) { /* If urgent, copy to Urgent folder */ create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "Urgent"); } else { create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "INBOX"); @@ -4121,7 +4121,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ } } #ifndef IMAP_STORAGE - if (!strcmp(flag, "Urgent")) { /* If this is an Urgent message */ + if (!ast_strlen_zero(flag) && !strcmp(flag, "Urgent")) { /* If this is an Urgent message */ /* Move the message from INBOX to Urgent folder if this is urgent! */ char sfn[PATH_MAX]; char dfn[PATH_MAX]; @@ -10502,7 +10502,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re case '4': if (outsidecaller) { /* only mark vm messages */ /* Mark Urgent */ - if (strcmp(flag, "Urgent")) { + if (!ast_strlen_zero(flag) && strcmp(flag, "Urgent")) { ast_verbose(VERBOSE_PREFIX_3 "marking message as Urgent\n"); ast_debug(1000, "This message is too urgent!\n"); res = ast_play_and_wait(chan, "vm-marked-urgent"); @@ -10573,7 +10573,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (message_exists) { cmd = ast_play_and_wait(chan, "vm-review"); if (!cmd && outsidecaller) { - if (strcmp(flag, "Urgent")) { + if (!ast_strlen_zero(flag) && strcmp(flag, "Urgent")) { cmd = ast_play_and_wait(chan, "vm-review-urgent"); } else { cmd = ast_play_and_wait(chan, "vm-review-unurgent"); |