From: Mark Andrews <marka@isc.org>
Date: Fri, 16 Nov 2018 01:23:36 +0000 (+1100)
Subject: (no commit message)
X-Git-Tag: v9.13.4~15^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ca5920113fcda3586b2b1e2a0a375b7c05791aa;p=thirdparty%2Fbind9.git

---

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 704bfcca069..5c449f34824 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -22,16 +22,17 @@
 #include <limits.h>
 
 #include <isc/bind9.h>
+#include <isc/hash.h>
 #include <isc/json.h>
 #include <isc/magic.h>
-#include <isc/hash.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
+#include <isc/mutex.h>
 #include <isc/once.h>
+#include <isc/print.h>
 #include <isc/refcount.h>
+#include <isc/strerr.h>
 #include <isc/string.h>
-#include <isc/mutex.h>
-#include <isc/print.h>
 #include <isc/util.h>
 #include <isc/xml.h>
 
@@ -734,8 +735,9 @@ default_memalloc(void *arg, size_t size) {
 
 	if (ptr == NULL && size != 0) {
 		char strbuf[ISC_STRERRORSIZE];
+		strerror_r(errno, strbuf, sizeof(strbuf));
 		isc_error_fatal(__FILE__, __LINE__, "malloc failed: %s",
-				strerror_r(errno, strbuf, sizeof(strbuf)));
+				strbuf);
 	}
 
 	return (ptr);
diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index 18deb7ace01..7f10a9ac38d 100644
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -20,6 +20,8 @@
 
 #include <ifaddrs.h>
 
+#include <isc/strerr.h>
+
 /*% Iterator Magic */
 #define IFITER_MAGIC		ISC_MAGIC('I', 'F', 'I', 'G')
 /*% Valid Iterator */