From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 9 Feb 2008 06:23:49 +0000 (+0000)
Subject: Commit fix for being unable to send voicemail from VoiceMailMain
X-Git-Tag: 1.4.19~192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42463c4bb28d55bfd074f8fb3cd5f15922561b82;p=thirdparty%2Fasterisk.git

Commit fix for being unable to send voicemail from VoiceMailMain
 Reported by: William F Acker (via the -users mailing list)
 Patch by: Corydon76 (license 14)


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4cf6895d14..85afac465c 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4117,7 +4117,11 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
 	if (flag==1) {
 		struct leave_vm_options leave_options;
 		char mailbox[AST_MAX_EXTENSION * 2 + 2];
-		snprintf(mailbox, sizeof(mailbox), "%s@%s", username, context);
+		/* Make sure that context doesn't get set as a literal "(null)" (or else find_user won't find it) */
+		if (context)
+			snprintf(mailbox, sizeof(mailbox), "%s@%s", username, context);
+		else
+			ast_copy_string(mailbox, username, sizeof(mailbox));
 
 		/* Send VoiceMail */
 		memset(&leave_options, 0, sizeof(leave_options));