upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-14 22:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '674-abort-when-memory-allocation-fails-v9_11' into 'v9_11'

Browse source 
(v9_11) Resolve "abort when memory allocation fails"

See merge request isc-projects/bind9!1274
This commit is contained in:
Ondřej Surý 2018-12-21 03:13:37 -05:00
commit b865b66094
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -25,6 +25,8 @@
5101. [bug] Fix default installation path for Python modules.
[GL #730]
5098. [func] Failed memory allocations are now fatal. [GL #674]
5097. [cleanup] Remove embedded ATF unit testing framework
from BIND source distribution. [GL !875]

45
lib/isc/mem.c
View file

@ -14,6 +14,7 @@
#include <config.h>
#include <inttypes.h>
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@ -28,6 +29,7 @@
#include <isc/once.h>
#include <isc/ondestroy.h>
#include <isc/string.h>
#include <isc/strerror.h>
#include <isc/mutex.h>
#include <isc/print.h>
#include <isc/util.h>
@ -861,11 +863,48 @@ mem_putstats(isc__mem_t *ctx, void *ptr, size_t size) {
static void *
default_memalloc(void *arg, size_t size) {
UNUSED(arg);
if (size == 0U)
if (size == 0U) {
size = 1;
}
return (malloc(size));
}
static void *
internal_memalloc(void *arg, size_t size) {
void *ptr;
UNUSED(arg);
if (size == 0U) {
size = 1;
}
ptr = malloc(size);
/*
* If the space cannot be allocated, a null pointer is returned. If the
* size of the space requested is zero, the behavior is
* implementation-defined: either a null pointer is returned, or the
* behavior is as if the size were some nonzero value, except that the
* returned pointer shall not be used to access an object.
* [ISO9899 § 7.22.3]
*
* [ISO9899]
* ISO/IEC WG 9899:2011: Programming languages - C.
* International Organization for Standardization, Geneva, Switzerland.
* http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1570.pdf
*/
if (ptr == NULL && size != 0) {
char strbuf[ISC_STRERRORSIZE];
strerror_r(errno, strbuf, sizeof(strbuf));
isc_error_fatal(__FILE__, __LINE__, "malloc failed: %s", strbuf);
}
return (ptr);
}
static void
default_memfree(void *arg, void *ptr) {
UNUSED(arg);
@ -2707,7 +2746,7 @@ isc_mem_create(size_t init_max_size, size_t target_size, isc_mem_t **mctxp) {
if (isc_bind9)
return (isc_mem_createx2(init_max_size, target_size,
default_memalloc, default_memfree,
internal_memalloc, default_memfree,
NULL, mctxp, isc_mem_defaultflags));
LOCK(&createlock);
@ -2726,7 +2765,7 @@ isc_mem_create2(size_t init_max_size, size_t target_size, isc_mem_t **mctxp,
{
if (isc_bind9)
return (isc_mem_createx2(init_max_size, target_size,
default_memalloc, default_memfree,
internal_memalloc, default_memfree,
NULL, mctxp, flags));
return (isc_mem_createx2(init_max_size, target_size,