7 files changed, 51 insertions, 43 deletions

diff --git a/include/compat/dirent_msvc.h b/include/compat/dirent_msvc.h
index 67f295f..2689399 100644
--- a/include/compat/dirent_msvc.h
+++ b/include/compat/dirent_msvc.h
@@ -47,6 +47,7 @@
 
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <stdint.h>
 
 /* Indicates that d_type field is available in dirent structure */
 #define _DIRENT_HAVE_D_TYPE
@@ -154,7 +155,7 @@ _wopendir(const wchar_t *dirname)
         /* Allocate new _WDIR structure */
         dirp =(_WDIR*) malloc(sizeof(struct _WDIR));
         if (dirp != NULL) {
-                DWORD n;
+                DWORD n, len;
 
                 /* Reset _WDIR structure */
                 dirp->handle = INVALID_HANDLE_VALUE;
@@ -165,7 +166,8 @@ _wopendir(const wchar_t *dirname)
                 n = GetFullPathNameW(dirname, 0, NULL, NULL);
 
                 /* Allocate room for absolute directory name and search pattern */
-                dirp->patt =(wchar_t*) malloc(sizeof(wchar_t) * n + 16);
+                if (n <= (SIZE_MAX - 16) / sizeof(wchar_t))
+                        dirp->patt =(wchar_t*) malloc(sizeof(wchar_t) * n + 16);
                 if (dirp->patt) {
 
                         /*
@@ -173,12 +175,12 @@ _wopendir(const wchar_t *dirname)
                          * allows rewinddir() to function correctly even when current
                          * working directory is changed between opendir() and rewinddir().
                          */
-                        n = GetFullPathNameW(dirname, n, dirp->patt, NULL);
-                        if (n > 0) {
+                        len = GetFullPathNameW(dirname, n, dirp->patt, NULL);
+                        if (len > 0 && len < n) {
                                 wchar_t *p;
 
                                 /* Append search pattern \* to the directory name */
-                                p = dirp->patt + n;
+                                p = dirp->patt + len;
                                 if (dirp->patt < p) {
                                         switch(p[-1]) {
                                         case '\\':
@@ -214,6 +216,7 @@ _wopendir(const wchar_t *dirname)
 
                 } else {
                         /* Cannot allocate memory for search pattern */
+                        _set_errno(ENOMEM);
                         error = 1;
                 }
 
diff --git a/include/compat/endian.h b/include/compat/endian.h
index 89c83fc..8022e0e 100644
--- a/include/compat/endian.h
+++ b/include/compat/endian.h
@@ -182,15 +182,15 @@ static inline uint64_t htole64(uint64_t x) {
                 uint64_t u64;
                 unsigned char bytes[8];
         } val;
-        val.u64 = x;
-        return ((uint64_t)val.bytes[0] << 56) |
-        ((uint64_t)val.bytes[1] << 48) |
-        ((uint64_t)val.bytes[2] << 40) |
-        ((uint64_t)val.bytes[3] << 32) |
-        ((uint64_t)val.bytes[4] << 24) |
-        ((uint64_t)val.bytes[5] << 16) |
-        ((uint64_t)val.bytes[6] << 8) |
-        (uint64_t)val.bytes[7];
+        val.bytes[0] = (unsigned char)x;
+        val.bytes[1] = (unsigned char)(x >> 8);
+        val.bytes[2] = (unsigned char)(x >> 16);
+        val.bytes[3] = (unsigned char)(x >> 24);
+        val.bytes[4] = (unsigned char)(x >> 32);
+        val.bytes[5] = (unsigned char)(x >> 40);
+        val.bytes[6] = (unsigned char)(x >> 48);
+        val.bytes[7] = (unsigned char)(x >> 56);
+        return val.u64;
 #endif
 }
 
diff --git a/include/compat/pthread.h b/include/compat/pthread.h
index 8211dda..7702dcd 100644
--- a/include/compat/pthread.h
+++ b/include/compat/pthread.h
@@ -110,8 +110,11 @@ pthread_mutex_unlock(pthread_mutex_t *mutex)
 static inline int
 pthread_mutex_destroy(pthread_mutex_t *mutex)
 {
-        DeleteCriticalSection(mutex->lock);
-        free(mutex->lock);
+        if (mutex->lock != NULL) {
+                DeleteCriticalSection(mutex->lock);
+                free(mutex->lock);
+                mutex->lock = NULL;
+        }
         return 0;
 }
 
diff --git a/include/compat/stdio.h b/include/compat/stdio.h
index 2ccdeeb..d9b8725 100644
--- a/include/compat/stdio.h
+++ b/include/compat/stdio.h
@@ -57,7 +57,25 @@ int posix_rename(const char *oldpath, const char *newpath);
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf _snprintf
+#include <stdarg.h>
+
+static inline int
+libressl_snprintf(char *str, size_t size, const char *format, ...)
+{
+        va_list ap;
+        int ret;
+
+        va_start(ap, format);
+        ret = _vsnprintf(str, size, format, ap);
+        va_end(ap);
+
+        /* _vsnprintf does not NUL-terminate when the output is truncated. */
+        if (size != 0)
+                str[size - 1] = '\0';
+
+        return ret;
+}
+#define snprintf libressl_snprintf
 #endif
 
 #endif
diff --git a/include/compat/sys/time.h b/include/compat/sys/time.h
index 2448969..0388333 100644
--- a/include/compat/sys/time.h
+++ b/include/compat/sys/time.h
@@ -7,16 +7,15 @@
 #define LIBCRYPTOCOMPAT_SYS_TIME_H
 
 #ifdef _MSC_VER
+/*
+ * Use the winsock struct timeval: it is what <openssl/dtls1.h> gives
+ * callers of DTLSv1_get_timeout() and the dgram BIO ctrls, so libssl
+ * must be built against the same layout.
+ */
 #include <winsock2.h>
 
-#define timeval libressl_timeval
 #define gettimeofday libressl_gettimeofday
 
-struct timeval {
-        long long       tv_sec;
-        long            tv_usec;
-};
-
 int gettimeofday(struct timeval *tp, void *tzp);
 #else
 #include_next <sys/time.h>
diff --git a/include/compat/syslog.h b/include/compat/syslog.h
index 3528eb3..c7a2608 100644
--- a/include/compat/syslog.h
+++ b/include/compat/syslog.h
@@ -36,23 +36,3 @@ void vsyslog_r(int, struct syslog_data *, const char *, va_list);
 #endif
 
 #endif
-
-#ifdef _AIX
-#ifdef HAVE_SYSLOG
-#include <stdlib.h>
-void vsyslog(int facility_priority, const char *format, va_list arglist) {
-        char *msg = NULL;
-        vasprintf(&msg, format, arglist);
-
-        if (!msg)
-                return;
-
-        syslog(facility_priority, "%s", msg);
-        free(msg);
-}
-#endif /* HAVE_SYSLOG */
-
-void vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap) {
-        vsyslog(pri, fmt, ap);
-}
-#endif /* AIX */
diff --git a/include/compat/unistd.h b/include/compat/unistd.h
index 544cb27..0ce66dd 100644
--- a/include/compat/unistd.h
+++ b/include/compat/unistd.h
@@ -75,8 +75,13 @@ int getentropy(void *buf, size_t buflen);
 int getpagesize(void);
 #endif
 
+#ifndef HAVE_PLEDGE
 #define pledge(request, paths) 0
+#endif
+
+#ifndef HAVE_UNVEIL
 #define unveil(path, permissions) 0
+#endif
 
 #ifndef HAVE_PIPE2
 int pipe2(int fildes[2], int flags);