diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-09-06 03:52:49 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-09-06 03:52:49 +0000 |
| commit | cc2074d617c25e17922eefd30fa5263c71c1a9ee (patch) | |
| tree | 3a57c7902c73ec85596269cde544dc41f8ecf66f | |
| parent | ad5354a390c755d1dcdb541705720837f3abfc73 (diff) | |
| download | nss-hg-cc2074d617c25e17922eefd30fa5263c71c1a9ee.tar.gz | |
Bug 136804: initialize inFile to PR_STDIN instead of NULL so that we don't
crash if the -i option is not specified. Added two assertions to avoid
closing PR_STDIN due to internal errors.
| -rw-r--r-- | security/nss/cmd/certutil/certutil.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c index 0d7caafe5..6b154f944 100644 --- a/security/nss/cmd/certutil/certutil.c +++ b/security/nss/cmd/certutil/certutil.c @@ -2161,7 +2161,7 @@ main(int argc, char **argv) CERTCertDBHandle *certHandle; PK11SlotInfo *slot = NULL; CERTName * subject = 0; - PRFileDesc *inFile = 0; + PRFileDesc *inFile = PR_STDIN; PRFileDesc *outFile = 0; char * certfile = "tempcert"; char * certreqfile = "tempcertreq"; @@ -2693,6 +2693,7 @@ main(int argc, char **argv) */ if (certutil.commands[cmd_CreateAndAddCert].activated) { + PORT_Assert(inFile != PR_STDIN); PR_Close(inFile); PR_Close(outFile); inFile = PR_Open(certfile, PR_RDONLY, 0); @@ -2717,6 +2718,7 @@ main(int argc, char **argv) } if (certutil.commands[cmd_CreateAndAddCert].activated) { + PORT_Assert(inFile != PR_STDIN); PR_Close(inFile); PR_Delete(certfile); PR_Delete(certreqfile); |