review 2 -- just use NAME_MAX

Author: gwr

src/native/libs/System.Security.Cryptography.Native/pal_x509.c

@@ -435,14 +435,6 @@ X509* CryptoNative_X509UpRef(X509* x509)
     return x509;
 }
 
-// On some platforms (like illumos), d_name is declared as char[1], so sizeof(d_name) doesn't give
-// the actual maximum length. Use NAME_MAX or MAXNAMLEN instead.
-#ifdef NAME_MAX
-static size_t maxNameLen = NAME_MAX;
-#else
-static size_t maxNameLen = 255; // Reasonable default
-#endif
-
 static DIR* OpenUserStore(const char* storePath, char** pathTmp, size_t* pathTmpSize, char** nextFileWrite)
 {
     DIR* trustDir = opendir(storePath);
@@ -456,9 +448,12 @@ static DIR* OpenUserStore(const char* storePath, char** pathTmp, size_t* pathTmp
 
     size_t storePathLen = strlen(storePath);
 
-    // Allocate enough space for the store path, a '/', the maximum filename length, and a null terminator
-
-    size_t allocSize = storePathLen + maxNameLen + 2; // +2 for '/' and '\0'
+    // d_name is a fixed length char[], not a char*.
+    // The traditional declaration (eg. SunOS) is d_name[1]
+    // so we can't assume sizeof(ent->d_name) will work,
+    // so just use NAME_MAX which is the POSIX way.
+    // Leave one byte for '\0' and one for '/'
+    size_t allocSize = storePathLen + NAME_MAX + 2;
     char* tmp = (char*)calloc(allocSize, sizeof(char));
     if (!tmp)
     {
@@ -488,7 +483,7 @@ static X509* ReadNextPublicCert(DIR* dir, X509Stack* tmpStack, char* pathTmp, si
 
     while ((next = readdir(dir)) != NULL)
     {
-        size_t len = strnlen(next->d_name, maxNameLen);
+        size_t len = strnlen(next->d_name, NAME_MAX);
 
         if (len > 4 && 0 == strncasecmp(".pfx", next->d_name + len - 4, 4))
         {