| Index: mozilla/security/nss/lib/nss/nssinit.c
|
| ===================================================================
|
| --- mozilla/security/nss/lib/nss/nssinit.c (revision 158129)
|
| +++ mozilla/security/nss/lib/nss/nssinit.c (working copy)
|
| @@ -34,6 +34,7 @@
|
| #include "secmodi.h"
|
| #include "ocspti.h"
|
| #include "ocspi.h"
|
| +#include "utilpars.h"
|
|
|
| /*
|
| * On Windows nss3.dll needs to export the symbol 'mktemp' to be
|
| @@ -375,39 +376,39 @@
|
| * configdir is double nested, and Windows uses the same character
|
| * for file seps as we use for escapes! (sigh).
|
| */
|
| - lconfigdir = secmod_DoubleEscape(configdir, '\'', '\"');
|
| + lconfigdir = NSSUTIL_DoubleEscape(configdir, '\'', '\"');
|
| if (lconfigdir == NULL) {
|
| goto loser;
|
| }
|
| - lcertPrefix = secmod_DoubleEscape(certPrefix, '\'', '\"');
|
| + lcertPrefix = NSSUTIL_DoubleEscape(certPrefix, '\'', '\"');
|
| if (lcertPrefix == NULL) {
|
| goto loser;
|
| }
|
| - lkeyPrefix = secmod_DoubleEscape(keyPrefix, '\'', '\"');
|
| + lkeyPrefix = NSSUTIL_DoubleEscape(keyPrefix, '\'', '\"');
|
| if (lkeyPrefix == NULL) {
|
| goto loser;
|
| }
|
| - lsecmodName = secmod_DoubleEscape(secmodName, '\'', '\"');
|
| + lsecmodName = NSSUTIL_DoubleEscape(secmodName, '\'', '\"');
|
| if (lsecmodName == NULL) {
|
| goto loser;
|
| }
|
| - lupdateDir = secmod_DoubleEscape(updateDir, '\'', '\"');
|
| + lupdateDir = NSSUTIL_DoubleEscape(updateDir, '\'', '\"');
|
| if (lupdateDir == NULL) {
|
| goto loser;
|
| }
|
| - lupdCertPrefix = secmod_DoubleEscape(updCertPrefix, '\'', '\"');
|
| + lupdCertPrefix = NSSUTIL_DoubleEscape(updCertPrefix, '\'', '\"');
|
| if (lupdCertPrefix == NULL) {
|
| goto loser;
|
| }
|
| - lupdKeyPrefix = secmod_DoubleEscape(updKeyPrefix, '\'', '\"');
|
| + lupdKeyPrefix = NSSUTIL_DoubleEscape(updKeyPrefix, '\'', '\"');
|
| if (lupdKeyPrefix == NULL) {
|
| goto loser;
|
| }
|
| - lupdateID = secmod_DoubleEscape(updateID, '\'', '\"');
|
| + lupdateID = NSSUTIL_DoubleEscape(updateID, '\'', '\"');
|
| if (lupdateID == NULL) {
|
| goto loser;
|
| }
|
| - lupdateName = secmod_DoubleEscape(updateName, '\'', '\"');
|
| + lupdateName = NSSUTIL_DoubleEscape(updateName, '\'', '\"');
|
| if (lupdateName == NULL) {
|
| goto loser;
|
| }
|
| @@ -724,6 +725,10 @@
|
| PZ_NotifyAllCondVar(nssInitCondition);
|
| PZ_Unlock(nssInitLock);
|
|
|
| + if (initContextPtr && configStrings) {
|
| + PR_smprintf_free(configStrings);
|
| + }
|
| +
|
| return SECSuccess;
|
|
|
| loser:
|
| @@ -1270,10 +1275,6 @@
|
| vpatch == NSS_VPATCH && vbuild > NSS_VBUILD) {
|
| return PR_FALSE;
|
| }
|
| - /* Check dependent libraries */
|
| - if (PR_VersionCheck(PR_VERSION) == PR_FALSE) {
|
| - return PR_FALSE;
|
| - }
|
| return PR_TRUE;
|
| }
|
|
|
|
|