[svn-commits] tilghman: branch 1.2 r47862 - /branches/1.2/apps/app_voicemail.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Mon Nov 20 13:59:07 2006
New Revision: 47862

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47862
Log:
Failing to trap -1 error from mmap causes segfault (Issue 8385)

Modified:
    branches/1.2/apps/app_voicemail.c

Modified: branches/1.2/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_voicemail.c?view=diff&rev=47862&r1=47861&r2=47862
==============================================================================
--- branches/1.2/apps/app_voicemail.c (original)
+++ branches/1.2/apps/app_voicemail.c Mon Nov 20 13:59:07 2006
@@ -935,8 +935,13 @@
 						fd = -1;
 						continue;
 					}
-					if (fd > -1)
-						fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+					if (fd > -1) {
+						if ((fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == -1) {
+							ast_log(LOG_WARNING, "Could not mmap the output file: %s (%d)\n", strerror(errno), errno);
+							SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+							goto yuck;
+						}
+					}
 				}
 				if (fdm) {
 					memset(fdm, 0, fdlen);