diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 13:55:25 -0800 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2018-12-13 13:55:25 -0800 |
| commit | 3b91f4c117003a9f42717fe88257b6025790169e (patch) | |
| tree | e4e6af5c4151179113d084c99d480a794c1831aa /Mkfiles | |
| parent | 51222ab69e7ac1854587321442638620aa4829ba (diff) | |
| download | nasm-3b91f4c117003a9f42717fe88257b6025790169e.tar.gz | |
malloc: handle potential infinite loop in nasm_alloc_failed()
It is possible on memory exhaustion that nasm_fatal() might cause
another allocation error, thus calling nasm_alloc_failed() again. If
we find us in nasm_alloc_failed() for a second time, try to get a
message out and then call abort().
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'Mkfiles')
| -rw-r--r-- | Mkfiles/msvc.mak | 2 | ||||
| -rw-r--r-- | Mkfiles/openwcom.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 9aec80fc..c7bd9109 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -68,7 +68,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) \ \ nasmlib\ver.$(O) \ - nasmlib\crc64.$(O) nasmlib\malloc.$(O) \ + nasmlib\crc64.$(O) nasmlib\malloc.$(O) nasmlib\errfile.$(O) \ nasmlib\md5c.$(O) nasmlib\string.$(O) \ nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) \ nasmlib\realpath.$(O) nasmlib\path.$(O) \ diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 084014bb..11582ecf 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -57,7 +57,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & stdlib\strnlen.$(O) stdlib\strrchrnul.$(O) & & nasmlib\ver.$(O) & - nasmlib\crc64.$(O) nasmlib\malloc.$(O) & + nasmlib\crc64.$(O) nasmlib\malloc.$(O) nasmlib\errfile.$(O) & nasmlib\md5c.$(O) nasmlib\string.$(O) & nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) & nasmlib\realpath.$(O) nasmlib\path.$(O) & |