|
 |
18bcd8b |
From d8ead122f34375a496d280bcc803f730542ca78d Mon Sep 17 00:00:00 2001
|
|
|
18bcd8b |
From: Peter Jones <pjones@redhat.com>
|
|
|
18bcd8b |
Date: Wed, 17 Oct 2012 17:47:49 -0400
|
|
|
11a11c6 |
Subject: [PATCH 24/42] Make sure we free the token/cert we get from the
|
|
|
18bcd8b |
command line.
|
|
|
18bcd8b |
|
|
|
18bcd8b |
This probably needs some further examination, but valgrind likes what's
|
|
|
18bcd8b |
here currently.
|
|
|
18bcd8b |
|
|
|
18bcd8b |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
18bcd8b |
---
|
|
|
18bcd8b |
src/pesign.c | 5 +++++
|
|
|
18bcd8b |
1 file changed, 5 insertions(+)
|
|
|
18bcd8b |
|
|
|
18bcd8b |
diff --git a/src/pesign.c b/src/pesign.c
|
|
|
18bcd8b |
index aa09bf5..be6494e 100644
|
|
|
18bcd8b |
--- a/src/pesign.c
|
|
|
18bcd8b |
+++ b/src/pesign.c
|
|
|
18bcd8b |
@@ -435,6 +435,7 @@ main(int argc, char *argv[])
|
|
|
18bcd8b |
|
|
|
18bcd8b |
char *digest_name = "sha256";
|
|
|
18bcd8b |
char *tokenname = "NSS Certificate DB";
|
|
|
18bcd8b |
+ char *origtoken = tokenname;
|
|
|
18bcd8b |
char *certname = NULL;
|
|
|
18bcd8b |
|
|
|
18bcd8b |
rc = pesign_context_new(&ctxp);
|
|
|
18bcd8b |
@@ -573,6 +574,8 @@ main(int argc, char *argv[])
|
|
|
18bcd8b |
PORT_ErrorToString(PORT_GetError()));
|
|
|
18bcd8b |
exit(1);
|
|
|
18bcd8b |
}
|
|
|
18bcd8b |
+ if (tokenname != origtoken)
|
|
|
18bcd8b |
+ free(tokenname);
|
|
|
18bcd8b |
|
|
|
18bcd8b |
ctxp->cms_ctx->certname = certname ?
|
|
|
18bcd8b |
PORT_ArenaStrdup(ctxp->cms_ctx->arena, certname) : NULL;
|
|
|
18bcd8b |
@@ -581,6 +584,8 @@ main(int argc, char *argv[])
|
|
|
18bcd8b |
PORT_ErrorToString(PORT_GetError()));
|
|
|
18bcd8b |
exit(1);
|
|
|
18bcd8b |
}
|
|
|
18bcd8b |
+ if (certname)
|
|
|
18bcd8b |
+ free(certname);
|
|
|
18bcd8b |
|
|
|
18bcd8b |
int action = 0;
|
|
|
18bcd8b |
if (daemon)
|
|
|
18bcd8b |
--
|
|
|
18bcd8b |
1.7.12.1
|
|
|
18bcd8b |
|