(no commit message)

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 704bfcca0696e3afaf3283184dab282cfa557f33..5c449f348241404d375012a5cd931a3786d08ee0 100644 (file)
--- 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 18deb7ace011fd7b38037ea8df7c9c7d0faf8bf0..7f10a9ac38d4802197603f2c1fe3342917ec7e05 100644 (file)
--- 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 */