From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 20 Nov 2006 20:00:54 +0000 (+0000)
Subject: Merged revisions 47862 via svnmerge from
X-Git-Tag: 1.4.0-beta4~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04c4fbb3b30ca181a32d8fc2d402d3b59937cf3d;p=thirdparty%2Fasterisk.git

Merged revisions 47862 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47862 | tilghman | 2006-11-20 13:59:07 -0600 (Mon, 20 Nov 2006) | 2 lines

Failing to trap -1 error from mmap causes segfault (Issue 8385)

........


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index df220c9c5b..df302170c3 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1098,8 +1098,13 @@ static int retrieve_file(char *dir, int msgnum)
 						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);