← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/cmd/pk11mode/pk11mode.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/cmd/pk11mode/pk11mode.c
780
780
        free(dbPrefix);
781
781
    }
782
782
    if (moduleSpec) {
783
 
        free(moduleSpec);
 
783
        PR_smprintf_free(moduleSpec);
784
784
    }
785
785
 
786
786
#ifdef _WIN32
5275
5275
    CK_RV crv = CKR_OK;
5276
5276
#ifndef NO_FORK_CHECK
5277
5277
    int rc = -1;
 
5278
    pid_t child, ret;
5278
5279
    NUMTESTS++; /* increment NUMTESTS */
5279
5280
    if (forkAssert) {
5280
5281
        putenv("NSS_STRICT_NOFORK=1");
5281
5282
    } else {
5282
5283
        putenv("NSS_STRICT_NOFORK=0");
5283
5284
    }
5284
 
    pid_t child = fork();
 
5285
    child = fork();
5285
5286
    switch (child) {
5286
5287
    case -1:
5287
5288
        PKM_Error("Fork failed.\n");
5316
5317
        exit(expected & 255);
5317
5318
    default:
5318
5319
        PKM_LogIt("Fork succeeded.\n");
5319
 
        pid_t ret = wait(&rc);
 
5320
        ret = wait(&rc);
5320
5321
        if (ret != child || (!WIFEXITED(rc)) ||
5321
5322
            ( (expected & 255) != (WEXITSTATUS(rc) & 255)) ) {
5322
5323
            int retStatus = -1;