Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/utilmod.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* 
  * The following code handles the storage of PKCS 11 modules used by the
  * NSS. For the rest of NSS, only one kind of database handle exists:
  *
  *     SFTKDBHandle
  *
  * There is one SFTKDBHandle for each key database and one for each cert 
@@ skipping 57 matching lines @@
  * nss="NSS parameters"
  * other="parameters for other libraries and applications"
  * 
  * library=libmynextpk11.so
  * name="My other PKCS#11 module"
  */
 
 
 /*
  * Smart string cat functions. Automatically manage the memory.
- * The first parameter is the source string. If it's null, we 
+ * The first parameter is the destination string. If it's null, we 
  * allocate memory for it. If it's not, we reallocate memory
  * so the the concanenated string fits.
  */
 static char *
 nssutil_DupnCat(char *baseString, const char *str, int str_len)
 {
-    int len = (baseString ? PORT_Strlen(baseString) : 0) + 1;
+    int baseStringLen = baseString ? PORT_Strlen(baseString) : 0;
+    int len = baseStringLen + 1;
     char *newString;
 
     len += str_len;
     newString = (char *) PORT_Realloc(baseString,len);
     if (newString == NULL) {
         PORT_Free(baseString);
         return NULL;
     }
-    if (baseString == NULL) *newString = 0;
-    return PORT_Strncat(newString,str, str_len);
+    PORT_Memcpy(&newString[baseStringLen], str, str_len);
+    newString[len - 1] = 0;
+    return newString;
 }
 
 /* Same as nssutil_DupnCat except it concatenates the full string, not a
  * partial one */
 static char *
 nssutil_DupCat(char *baseString, const char *str)
 {
     return nssutil_DupnCat(baseString, str, PORT_Strlen(str));
 }
 
@@ skipping 367 matching lines @@
     /* SHDB_FIXME implement */
     os_stat_type stat_existing;
     os_open_permissions_type file_mode;
     FILE *fd = NULL;
     FILE *fd2 = NULL;
     char line[MAX_LINE_LENGTH];
     char *dbname2 = NULL;
     char *block = NULL;
     char *name = NULL;
     char *lib = NULL;
-    int name_len, lib_len;
+    int name_len = 0, lib_len = 0;
     PRBool skip = PR_FALSE;
     PRBool found = PR_FALSE;
 
     if (dbname == NULL) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
 
     if (!rw) {
         PORT_SetError(SEC_ERROR_READ_ONLY);
@@ skipping 233 matching lines @@
                                              secmod, (char **)args, rw)
                  == SECSuccess) ? &success: NULL;
         break;
     }
 done:
     if (secmod) PR_smprintf_free(secmod);
     if (appName) PORT_Free(appName);
     if (filename) PORT_Free(filename);
     return rvstr;
 }