Always set *size to zero if *bufptr is NULL, it's more make sence. fix #8095
Unified · Split
| @@ -60,6 +60,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, · 59 unmodified lines | ||
| 60 | 60 | off_t off_size; |
| 61 | 61 | char errbuf[128]; |
| 62 | 62 | *bufptr = NULL; |
| 63 | + *size = 0; | |
| 63 | 64 | |
| 64 | 65 | if (fd < 0) { |
| 65 | 66 | err = AVERROR(errno); |
| @@ -97,6 +98,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, · 31 unmodified lines | ||
| 97 | 98 | av_strerror(err, errbuf, sizeof(errbuf)); |
| 98 | 99 | av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in mmap(): %s\n", errbuf); |
| 99 | 100 | close(fd); |
| 101 | + *size = 0; | |
| 100 | 102 | return err; |
| 101 | 103 | } |
| 102 | 104 | *bufptr = ptr; |
| @@ -108,6 +110,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, · 5 unmodified lines | ||
| 108 | 110 | if (!mh) { |
| 109 | 111 | av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in CreateFileMapping()\n"); |
| 110 | 112 | close(fd); |
| 113 | + *size = 0; | |
| 111 | 114 | return -1; |
| 112 | 115 | } |
| 113 | 116 | |
| @@ -116,6 +119,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, · 2 unmodified lines | ||
| 116 | 119 | if (!ptr) { |
| 117 | 120 | av_log(&file_log_ctx, AV_LOG_ERROR, "Error occurred in MapViewOfFile()\n"); |
| 118 | 121 | close(fd); |
| 122 | + *size = 0; | |
| 119 | 123 | return -1; |
| 120 | 124 | } |
| 121 | 125 | |
| @@ -126,6 +130,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, · 4 unmodified lines | ||
| 126 | 130 | if (!*bufptr) { |
| 127 | 131 | av_log(&file_log_ctx, AV_LOG_ERROR, "Memory allocation error occurred\n"); |
| 128 | 132 | close(fd); |
| 133 | + *size = 0; | |
| 129 | 134 | return AVERROR(ENOMEM); |
| 130 | 135 | } |
| 131 | 136 | read(fd, *bufptr, *size); |