chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always check asprintf return code
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup.c
diff --git
a/src/cryptsetup/cryptsetup.c
b/src/cryptsetup/cryptsetup.c
index a67d85e623c685a0ac96e7d0df3d7c8b39b2713e..67dc88fa515c37a02eef4d366badac4399a35203 100644
(file)
--- a/
src/cryptsetup/cryptsetup.c
+++ b/
src/cryptsetup/cryptsetup.c
@@
-549,13
+549,18
@@
int main(int argc, char *argv[]) {
description = NULL;
}
description = NULL;
}
+ k = 0;
if (mount_point && description)
if (mount_point && description)
- asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point);
+
k =
asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point);
else if (mount_point)
else if (mount_point)
- asprintf(&name_buffer, "%s on %s", argv[2], mount_point);
+
k =
asprintf(&name_buffer, "%s on %s", argv[2], mount_point);
else if (description)
else if (description)
- asprintf(&name_buffer, "%s (%s)", description, argv[2]);
+
k =
asprintf(&name_buffer, "%s (%s)", description, argv[2]);
+ if (k < 0) {
+ log_oom();
+ goto finish;
+ }
name = name_buffer ? name_buffer : argv[2];
k = crypt_init(&cd, argv[3]);
name = name_buffer ? name_buffer : argv[2];
k = crypt_init(&cd, argv[3]);