File nss-sle11-no-putenv.patch of Package mozilla-nss

Overview Repositories Revisions Requests Users Attributes Meta

File nss-sle11-no-putenv.patch of Package mozilla-nss

# HG changeset patch
# Parent  1d7c31e2a4f663865293b3a501dcaafd2a758725

diff --git a/cmd/pk11mode/pk11mode.c b/cmd/pk11mode/pk11mode.c
--- a/cmd/pk11mode/pk11mode.c
+++ b/cmd/pk11mode/pk11mode.c
@@ -5299,19 +5299,19 @@ PKM_ForkCheck(int expected, CK_FUNCTION_
               PRBool forkAssert, CK_C_INITIALIZE_ARGS_NSS *initArgs)
 {
     CK_RV crv = CKR_OK;
 #ifndef NO_FORK_CHECK
     int rc = -1;
     pid_t child, ret;
     NUMTESTS++; /* increment NUMTESTS */
     if (forkAssert) {
-        putenv("NSS_STRICT_NOFORK=1");
+        setenv("NSS_STRICT_NOFORK", "1", 1);
     } else {
-        putenv("NSS_STRICT_NOFORK=0");
+        setenv("NSS_STRICT_NOFORK", "0", 1);
     }
     child = fork();
     switch (child) {
         case -1:
             PKM_Error("Fork failed.\n");
             crv = CKR_DEVICE_ERROR;
             break;
         case 0:
diff --git a/lib/util/secport.c b/lib/util/secport.c
--- a/lib/util/secport.c
+++ b/lib/util/secport.c
@@ -741,29 +741,20 @@ NSS_PutEnv(const char *envVarName, const
 #elif defined(__GNUC__) && __GNUC__ >= 7
     int setEnvFailed;
     setEnvFailed = setenv(envVarName, envValue, 1);
     if (setEnvFailed) {
         SET_ERROR_CODE
         return SECFailure;
     }
 #else
-    char *encoded = (char *)PORT_ZAlloc(strlen(envVarName) + 2 + strlen(envValue));
-    if (!encoded) {
-        return SECFailure;
-    }
-    strcpy(encoded, envVarName);
-    strcat(encoded, "=");
-    strcat(encoded, envValue);
-    int putEnvFailed = putenv(encoded); /* adopt. */
-
+    int putEnvFailed = setenv(envVarName, envValue, 1);
     if (putEnvFailed) {
         SET_ERROR_CODE
         result = SECFailure;
-        PORT_Free(encoded);
     }
 #endif
     return result;
 }
 
 /*
  * Perform a constant-time compare of two memory regions. The return value is
  * 0 if the memory regions are equal and non-zero otherwise.

Places

File nss-sle11-no-putenv.patch of Package mozilla-nss

Places