[FFmpeg-devel] [PATCH V1] avutil/file: always set *size to zero if *bufptr is NULL

[Jun Zhao]

From: Jun Zhao <barryjz...@tencent.com>

Always set *size to zero if *bufptr is NULL, it's more make sence.

fix #8095

Signed-off-by: Jun Zhao <barryjz...@tencent.com>
---
 libavutil/file.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/libavutil/file.c b/libavutil/file.c
index d946085..f228b72 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -60,6 +60,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, 
size_t *size,
     off_t off_size;
     char errbuf[128];
     *bufptr = NULL;
+    *size = 0;
 
     if (fd < 0) {
         err = AVERROR(errno);
@@ -97,6 +98,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, 
size_t *size,
         av_strerror(err, errbuf, sizeof(errbuf));
         av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in mmap(): %s\n", 
errbuf);
         close(fd);
+        *size = 0;
         return err;
     }
     *bufptr = ptr;
@@ -108,6 +110,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, 
size_t *size,
         if (!mh) {
             av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in 
CreateFileMapping()\n");
             close(fd);
+            *size = 0;
             return -1;
         }
 
@@ -116,6 +119,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, 
size_t *size,
         if (!ptr) {
             av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in 
MapViewOfFile()\n");
             close(fd);
+            *size = 0;
             return -1;
         }
 
@@ -126,6 +130,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, 
size_t *size,
     if (!*bufptr) {
         av_log(&file_log_ctx, AV_LOG_ERROR, "Memory allocation error 
occurred\n");
         close(fd);
+        *size = 0;
         return AVERROR(ENOMEM);
     }
     read(fd, *bufptr, *size);
@@ -138,7 +143,7 @@ out:
 
 void av_file_unmap(uint8_t *bufptr, size_t size)
 {
-    if (!size)
+    if (!size || !bufptr)
         return;
 #if HAVE_MMAP
     munmap(bufptr, size);
-- 
1.7.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".