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/branches/1.4@48944 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 3c2f80406f7d960dc74ed9d799adf4e988b4820f..287ad2e0ce8efb1ce9b986ef651d5075b86c836d 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1411,7 +1411,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;