[FFmpeg-cvslog] Fix error check in av_file_map()

Mans Rullgard git at videolan.org
Sun Jun 5 03:21:56 CEST 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sat Jun  4 13:36:35 2011 +0100| [d0989bed226578a8f37ca90c78abc97abafb9794] | committer: Mans Rullgard

Fix error check in av_file_map()

On failure, mmap() returns MAP_FAILED, which may or may not be -1.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0989bed226578a8f37ca90c78abc97abafb9794
---

 libavutil/file.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavutil/file.c b/libavutil/file.c
index 3dcce7c..f0e48b5 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -75,7 +75,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size,
 
 #if HAVE_MMAP
     ptr = mmap(NULL, *size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-    if ((int)(ptr) == -1) {
+    if (ptr == MAP_FAILED) {
         err = AVERROR(errno);
         av_strerror(err, errbuf, sizeof(errbuf));
         av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in mmap(): %s\n", errbuf);



More information about the ffmpeg-cvslog mailing list