4218. [bug] Potential null pointer dereference on out of memory if mmap is not supported. [RT #40777]
(cherry picked from commit 4dd41c7d59)
This commit is contained in:
2
CHANGES
2
CHANGES
@@ -1,3 +1,5 @@
|
||||
4218. [bug] Potential null pointer dereference on out of memory if mmap is not supported. [RT #40777]
|
||||
|
||||
4217. [protocol] Add support for CSYNC. [RT #40532]
|
||||
|
||||
4216. [cleanup] Silence static analysis warnings. [RT #40649]
|
||||
|
||||
@@ -674,6 +674,9 @@ isc_file_mmap(void *addr, size_t len, int prot,
|
||||
len = end - offset;
|
||||
|
||||
buf = malloc(len);
|
||||
if (buf == NULL)
|
||||
return (NULL);
|
||||
|
||||
ret = read(fd, buf, len);
|
||||
if (ret != (ssize_t) len) {
|
||||
free(buf);
|
||||
|
||||
@@ -751,6 +751,9 @@ isc_file_mmap(void *addr, size_t len, int prot,
|
||||
len = end - offset;
|
||||
|
||||
buf = malloc(len);
|
||||
if (buf == NULL)
|
||||
return (NULL);
|
||||
|
||||
ret = read(fd, buf, (unsigned int) len);
|
||||
if (ret != (ssize_t) len) {
|
||||
free(buf);
|
||||
|
||||
Reference in New Issue
Block a user