|
 |
18bcd8b |
From 8ffe6943f04d42314f81eb8b5e3350d4ccc41895 Mon Sep 17 00:00:00 2001
|
|
|
18bcd8b |
From: Peter Jones <pjones@redhat.com>
|
|
|
18bcd8b |
Date: Wed, 17 Oct 2012 15:26:23 -0400
|
|
|
11a11c6 |
Subject: [PATCH 17/42] Use PORT_ArenaStrdup() where appropriate.
|
|
|
18bcd8b |
|
|
|
18bcd8b |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
18bcd8b |
---
|
|
|
18bcd8b |
src/daemon.c | 15 ++++++---------
|
|
|
18bcd8b |
src/pesign.c | 12 ++++++------
|
|
|
18bcd8b |
2 files changed, 12 insertions(+), 15 deletions(-)
|
|
|
18bcd8b |
|
|
|
18bcd8b |
diff --git a/src/daemon.c b/src/daemon.c
|
|
|
18bcd8b |
index 07aaf6c..73fd924 100644
|
|
|
18bcd8b |
--- a/src/daemon.c
|
|
|
18bcd8b |
+++ b/src/daemon.c
|
|
|
18bcd8b |
@@ -205,9 +205,8 @@ malformed:
|
|
|
18bcd8b |
"unlocking token \"%s\"", tn->value);
|
|
|
18bcd8b |
|
|
|
18bcd8b |
/* authenticating with nss frees this ... best API ever. */
|
|
|
18bcd8b |
- ctx->cms->tokenname = PORT_ArenaZAlloc(ctx->cms->arena,
|
|
|
18bcd8b |
- strlen((char *)tn->value));
|
|
|
18bcd8b |
- strcpy(ctx->cms->tokenname, (char *)tn->value);
|
|
|
18bcd8b |
+ ctx->cms->tokenname = PORT_ArenaStrdup(ctx->cms->arena,
|
|
|
18bcd8b |
+ (char *)tn->value);
|
|
|
18bcd8b |
if (!ctx->cms->tokenname)
|
|
|
18bcd8b |
goto oom;
|
|
|
18bcd8b |
|
|
|
18bcd8b |
@@ -397,9 +396,8 @@ malformed:
|
|
|
18bcd8b |
n -= tn->size;
|
|
|
18bcd8b |
|
|
|
18bcd8b |
/* authenticating with nss frees these ... best API ever. */
|
|
|
18bcd8b |
- ctx->cms->tokenname = PORT_ArenaZAlloc(ctx->cms->arena,
|
|
|
18bcd8b |
- strlen((char *)tn->value));
|
|
|
18bcd8b |
- strcpy(ctx->cms->tokenname, (char *)tn->value);
|
|
|
18bcd8b |
+ ctx->cms->tokenname = PORT_ArenaStrdup(ctx->cms->arena,
|
|
|
18bcd8b |
+ (char *)tn->value);
|
|
|
18bcd8b |
if (!ctx->cms->tokenname)
|
|
|
18bcd8b |
goto oom;
|
|
|
18bcd8b |
|
|
|
18bcd8b |
@@ -410,9 +408,8 @@ malformed:
|
|
|
18bcd8b |
if (n < cn->size)
|
|
|
18bcd8b |
goto malformed;
|
|
|
18bcd8b |
|
|
|
18bcd8b |
- ctx->cms->certname = PORT_ArenaZAlloc(ctx->cms->arena,
|
|
|
18bcd8b |
- strlen((char *)cn->value));
|
|
|
18bcd8b |
- strcpy(ctx->cms->certname, (char *)cn->value);
|
|
|
18bcd8b |
+ ctx->cms->certname = PORT_ArenaStrdup(ctx->cms->arena,
|
|
|
18bcd8b |
+ (char *)cn->value);
|
|
|
18bcd8b |
if (!ctx->cms->certname)
|
|
|
18bcd8b |
goto oom;
|
|
|
18bcd8b |
|
|
|
18bcd8b |
diff --git a/src/pesign.c b/src/pesign.c
|
|
|
18bcd8b |
index c7b23cf..819cee0 100644
|
|
|
18bcd8b |
--- a/src/pesign.c
|
|
|
18bcd8b |
+++ b/src/pesign.c
|
|
|
18bcd8b |
@@ -551,17 +551,17 @@ main(int argc, char *argv[])
|
|
|
18bcd8b |
exit(!is_help);
|
|
|
18bcd8b |
}
|
|
|
18bcd8b |
|
|
|
18bcd8b |
- ctx.cms_ctx->tokenname = tokenname ?
|
|
|
18bcd8b |
- PORT_ArenaStrdup(ctx.cms_ctx->arena, tokenname) : NULL;
|
|
|
18bcd8b |
- if (tokenname && !ctx.cms_ctx->tokenname) {
|
|
|
18bcd8b |
+ ctxp->cms_ctx->tokenname = tokenname ?
|
|
|
18bcd8b |
+ PORT_ArenaStrdup(ctxp->cms_ctx->arena, tokenname) : NULL;
|
|
|
18bcd8b |
+ if (tokenname && !ctxp->cms_ctx->tokenname) {
|
|
|
18bcd8b |
fprintf(stderr, "could not allocate token name: %s\n",
|
|
|
18bcd8b |
PORT_ErrorToString(PORT_GetError()));
|
|
|
18bcd8b |
exit(1);
|
|
|
18bcd8b |
}
|
|
|
18bcd8b |
|
|
|
18bcd8b |
- ctx.cms_ctx->certname = certname ?
|
|
|
18bcd8b |
- PORT_ArenaStrdup(ctx.cms_ctx->arena, certname) : NULL;
|
|
|
18bcd8b |
- if (certname && !ctx.cms_ctx->certname) {
|
|
|
18bcd8b |
+ ctxp->cms_ctx->certname = certname ?
|
|
|
18bcd8b |
+ PORT_ArenaStrdup(ctxp->cms_ctx->arena, certname) : NULL;
|
|
|
18bcd8b |
+ if (certname && !ctxp->cms_ctx->certname) {
|
|
|
18bcd8b |
fprintf(stderr, "could not allocate certificate name: %s\n",
|
|
|
18bcd8b |
PORT_ErrorToString(PORT_GetError()));
|
|
|
18bcd8b |
exit(1);
|
|
|
18bcd8b |
--
|
|
|
18bcd8b |
1.7.12.1
|
|
|
18bcd8b |
|