[asterisk-commits] mmichelson: trunk r373740 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep 25 16:14:21 2012
New Revision: 373740

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373740
Log:
Fix error where improper IMAP greetings would be deleted.

(closes issue ASTERISK-20435)
Reported by: fhackenberger
Patches:
	asterisk-20435-imap-del-greeting.diff uploaded by Michael L. Young (License #5026)
	(with suggested modification made by me)
........

Merged revisions 373735 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373737 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 373738 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=373740&r1=373739&r2=373740
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Sep 25 16:14:21 2012
@@ -1965,6 +1965,11 @@
 		return;
 	}
 
+	if (msgnum < 0) {
+		imap_delete_old_greeting(file, vms);
+		return;
+	}
+
 	/* find real message number based on msgnum */
 	/* this may be an index into vms->msgArray based on the msgnum. */
 	messageNum = vms->msgArray[msgnum];