eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-17 13:50:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check all snprintf calls for returning values.

Browse Source
This commit is contained in:
Milan Broz
2022-02-24 15:03:21 +01:00
parent c27d6a89bb
commit 677e06c48a
12 changed files with 79 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils_args.c
View File

@@ -62,7 +62,8 @@ void tools_parse_arg_value(poptContext popt_context, crypt_arg_type_info type, s
/* special size strings with units converted to integers */
if (needs_size_conv_fn && needs_size_conv_fn(popt_val)) {
if (tools_string_to_size(popt_arg, &arg->u.u64_value)) {
snprintf(msg, sizeof(msg), _("Invalid size specification in parameter --%s."), arg->name);
if (snprintf(msg, sizeof(msg), _("Invalid size specification in parameter --%s."), arg->name) < 0)
msg[0] = '\0';
usage(popt_context, EXIT_FAILURE, msg,
poptGetInvocationName(popt_context));
}
@@ -118,7 +119,8 @@ void tools_check_args(const char *action, const struct tools_arg *args, size_t a
if (action_allowed(action, args[i].actions_array, MAX_ACTIONS)) {
continue;
} else {
(void)snprintf(msg, sizeof(msg), _("Option --%s is not allowed with %s action."), args[i].name, action);
if (snprintf(msg, sizeof(msg), _("Option --%s is not allowed with %s action."), args[i].name, action) < 0)
msg[0] = '\0';
usage(popt_context, EXIT_FAILURE, msg, poptGetInvocationName(popt_context));
}
}