diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-12-24 07:27:29 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-12-24 07:27:29 +0000 |
commit | 539514d793591943fc0099ad838efa3a0efecbee (patch) | |
tree | 3c931862a74bbff6d010e424823b6aa814dce12f | |
parent | e0f55d23855738e4b65d27327d65fc9188a0ff6b (diff) |
Merged revisions 48944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48944 | russell | 2006-12-24 02:25:38 -0500 (Sun, 24 Dec 2006) | 11 lines
Merged revisions 48943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48943 | russell | 2006-12-24 02:23:07 -0500 (Sun, 24 Dec 2006) | 3 lines
Check for the proper return value on an error in a call to mmap().
This was reported by Andy Wang on the asterisk-dev list. Thanks!
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 6456f4637..dda1e688c 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1469,7 +1469,7 @@ static int try_firmware(char *s) return -1; } fwh = mmap(NULL, stbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (!fwh) { + if (fwh == (void *) -1) { ast_log(LOG_WARNING, "mmap failed: %s\n", strerror(errno)); close(fd); return -1; |