clearenv polyfill logic change to use secure functions

Author: mitchcapper

osfixes.c

@@ -21,25 +21,23 @@
 #define TRUE 1
 #endif // !FALSE
 
-int clearenv(void)
-{
-	char* envp, * s;
-	char name[MAX_LONG_PATH];
 
+int clearenv(void) {
+	char* envp, * s;
+	char name[_MAX_ENV];
+	int name_len;
 
 	while (environ && (envp = *environ)) {
 		if ((s = strchr(envp, '=')) != NULL) {
-			strncpy(name, envp, s - envp + 1);
-			strncpy_s(name, sizeof(name), envp, s - envp+1);
-			name[s - envp + 1+1] = 0;
+			name_len = s - envp;
+			strncpy_s(name, sizeof(name), envp, name_len);
+			name[name_len + 1] = 0;
 
-			if (_putenv(name) == -1) {
+			if (_putenv_s(name, "") == -1)
 				return -1;
-			}
 		}
-		else {
+		else
 			return -1;
-		}
 	}
 	return 0;
 }
@@ -71,7 +69,7 @@ CONSTRUCTOR(wlb_at_startup) {
 #ifdef WLB_ALIGNED_ALLOC
 //memalign replacement note must use wlb_aligned_free to free
 void *wlb_aligned_alloc(size_t size, size_t alignment) {
-#ifndef _MSC_VER	
+#ifndef _MSC_VER
 #ifdef HAVE_POSIX_MEMALIGN
 	void *ptr=0;
     int result = posix_memalign(&ptr, alignment, size);

patches/repo_coreutils.patch

@@ -368,7 +368,7 @@ index 0e5d860a9..bcc0b3629 100644
 
  /* This function checks whether any of the directories in the cycle that
 diff --git a/src/env.c b/src/env.c
-index 17254c303..8a1f9b615 100644
+index 17254c303..178debc8b 100644
 --- a/src/env.c
 +++ b/src/env.c
 @@ -53,7 +53,9 @@ enum SIGNAL_MODE {
@@ -377,7 +377,7 @@ index 17254c303..8a1f9b615 100644
    DEFAULT_NOERR, /* Ditto, but ignore sigaction(2) errors.  */
 +#ifndef _WIN32
    IGNORE,        /* Set to ignore (SIG_IGN).  */
-+#endif  
++#endif
    IGNORE_NOERR   /* Ditto, but ignore sigaction(2) errors.  */
  };
  static enum SIGNAL_MODE *signals;
@@ -393,42 +393,41 @@ index 17254c303..8a1f9b615 100644
 +        if (sig2str (i, signame) == 0 && set_default)
 +          signals[i] = DEFAULT_NOERR;
 +      }
-+#endif 
++#endif
        return;
      }
 
-@@ -755,7 +765,29 @@ initialize_signals (void)
+@@ -755,7 +765,28 @@ initialize_signals (void)
 
    return;
  }
 -
 +#ifdef _WIN32
-+int clearenv(void)
-+{
++#include <../ucrt/stdio.h>
++static int clearenv(void) {
 +	char* envp, * s;
-+	char name[MAX_LONG_PATH];
++	char name[_MAX_ENV];
++	int name_len;
 +
 +	while (environ && (envp = *environ)) {
 +		if ((s = strchr(envp, '=')) != NULL) {
-+			strncpy(name, envp, s - envp + 1);
-+			strncpy_s(name, sizeof(name), envp, s - envp+1);
-+			name[s - envp + 1+1] = 0;
++			name_len = s - envp;
++			strncpy_s(name, sizeof(name), envp, name_len);
++			name[name_len + 1] = 0;
 +
-+			if (_putenv(name) == -1) {
++			if (_putenv_s(name, "") == -1)
 +				return -1;
-+			}
 +		}
-+		else {
++		else
 +			return -1;
-+		}
 +	}
 +	return 0;
 +}
 +#endif
  int
  main (int argc, char **argv)
  {
-@@ -839,8 +871,12 @@ main (int argc, char **argv)
+@@ -839,8 +870,12 @@ main (int argc, char **argv)
    if (ignore_environment)
      {
        devmsg ("cleaning environ\n");