Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1474887, skip NSS shutdown in error path, r=rrelyea
  • Loading branch information
kaie committed Jul 23, 2018
1 parent 804e6ff commit 0dbf885
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions cmd/nss-policy-check/nss-policy-check.c
Expand Up @@ -85,21 +85,21 @@ main(int argc, char **argv)
if (argc != 2) {
fprintf(stderr, "Syntax: nss-policy-check <path-to-policy-file>\n");
result = 2;
goto loser;
goto loser_no_shutdown;
}

fullPathLen = strlen(argv[1]);

if (!fullPathLen || PR_Access(argv[1], PR_ACCESS_READ_OK) != PR_SUCCESS) {
fprintf(stderr, "Error: cannot read file %s\n", argv[1]);
result = 2;
goto loser;
goto loser_no_shutdown;
}

if (fullPathLen >= PATH_MAX) {
fprintf(stderr, "Error: filename parameter is too long\n");
result = 2;
goto loser;
goto loser_no_shutdown;
}

path[0] = 0;
Expand All @@ -120,7 +120,7 @@ main(int argc, char **argv)
if (rv != SECSuccess) {
fprintf(stderr, "NSS_Init failed: %s\n", PORT_ErrorToString(PR_GetError()));
result = 2;
goto loser;
goto loser_no_shutdown;
}

PR_SetEnv("NSS_POLICY_LOADED=0");
Expand Down Expand Up @@ -196,6 +196,7 @@ main(int argc, char **argv)
fprintf(stderr, "NSS_Shutdown failed: %s\n", PORT_ErrorToString(PR_GetError()));
result = 2;
}
loser_no_shutdown:
if (result == 2) {
fprintf(stderr, "NSS-POLICY-FAIL\n");
} else if (result == 1) {
Expand Down

0 comments on commit 0dbf885

Please sign in to comment.