diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-07-09 21:15:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 21:15:08 +0100 |
| commit | af55491028a0722088a16ff6e20de2d6f1507640 (patch) | |
| tree | 2539803cc923019746122fb307c1c327c829d0a9 /src/creds | |
| parent | 2f0927626abf6ac6c99a42c1c7fa159063bfc8ee (diff) | |
| parent | d1829af943d0d47c745c3ce789690493e7b8107a (diff) | |
| download | systemd-af55491028a0722088a16ff6e20de2d6f1507640.tar.gz | |
Merge pull request #20186 from keszybz/coverity-fixes
Coverity fixes
Diffstat (limited to 'src/creds')
| -rw-r--r-- | src/creds/creds.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/creds/creds.c b/src/creds/creds.c index b58faf6589..c2a2eabbed 100644 --- a/src/creds/creds.c +++ b/src/creds/creds.c @@ -193,7 +193,7 @@ static int transcode( switch (arg_transcode) { case TRANSCODE_BASE64: { - char *buf = NULL; + char *buf; ssize_t l; l = base64mem_full(input, input_size, 79, &buf); @@ -704,30 +704,20 @@ static int parse_argv(int argc, char *argv[]) { arg_with_key = CRED_AES256_GCM_BY_TPM2_HMAC; break; - case ARG_TPM2_DEVICE: { - _cleanup_free_ char *device = NULL; - + case ARG_TPM2_DEVICE: if (streq(optarg, "list")) return tpm2_list_devices(); - if (!streq(optarg, "auto")) { - device = strdup(optarg); - if (!device) - return log_oom(); - } - - arg_tpm2_device = TAKE_PTR(device); + arg_tpm2_device = streq(optarg, "auto") ? NULL : optarg; break; - } - - case ARG_TPM2_PCRS: { - uint32_t mask; + case ARG_TPM2_PCRS: if (isempty(optarg)) { arg_tpm2_pcr_mask = 0; break; } + uint32_t mask; r = tpm2_parse_pcrs(optarg, &mask); if (r < 0) return r; @@ -738,7 +728,6 @@ static int parse_argv(int argc, char *argv[]) { arg_tpm2_pcr_mask |= mask; break; - } case ARG_NAME: if (isempty(optarg)) { |