Land #1304 - add overflow check to MSVC dirent compat

1 files changed, 4 insertions, 1 deletions

diff --git a/include/compat/dirent_msvc.h b/include/compat/dirent_msvc.h
index 67f295f..0f36803 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
@@ -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) {
 
                         /*
@@ -214,6 +216,7 @@ _wopendir(const wchar_t *dirname)
 
                 } else {
                         /* Cannot allocate memory for search pattern */
+                        _set_errno(ENOMEM);
                         error = 1;
                 }