summaryrefslogtreecommitdiff
path: root/src/shared/ask-password-api.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-07-18 11:12:47 +0200
committerGitHub <noreply@github.com>2016-07-18 11:12:47 +0200
commitb6070695c8f94bf47ffca8557048bdd16a833a12 (patch)
tree08b806c2ea2ff89f55fdd49837832f11833327cd /src/shared/ask-password-api.c
parentd909beef0a97d931de92723746a4e3ae9c7f1194 (diff)
parentb60df13b39c0237f9cb1114076464d2431e6bee5 (diff)
Merge pull request #3745 from keszybz/fix-make-nulstr-confusion
Fix make nulstr confusion
Diffstat (limited to 'src/shared/ask-password-api.c')
-rw-r--r--src/shared/ask-password-api.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index a86b0db554..65151b19a6 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -139,11 +139,7 @@ static int add_to_keyring(const char *keyname, AskPasswordFlags flags, char **pa
if (r < 0)
return r;
- /* Truncate trailing NUL */
- assert(n > 0);
- assert(p[n-1] == 0);
-
- serial = add_key("user", keyname, p, n-1, KEY_SPEC_USER_KEYRING);
+ serial = add_key("user", keyname, p, n, KEY_SPEC_USER_KEYRING);
memory_erase(p, n);
if (serial == -1)
return -errno;