mirrors/linux-pam
0
0
Fork 0
mirror of https://github.com/linux-pam/linux-pam.git synced 2024-11-24 02:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

pam_motd: cleanup calloc invocations

Browse Source 
Apply the following calloc invocation idiom:
  ptr = calloc(nmemb, sizeof(*ptr));

* modules/pam_motd/pam_motd.c (pam_split_string,
try_to_display_directories_with_overrides): Cleanup calloc invocations.

Fixes: f9c9c721 ("pam_motd: Support multiple motd paths specified, with filename overrides (#69)")
This commit is contained in:
Dmitry V. Levin 2020-04-26 11:12:59 +00:00
parent b77aa28f46
commit 49b9d3039d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/pam_motd/pam_motd.c
View File

@ -106,7 +106,7 @@ static int pam_split_string(const pam_handle_t *pamh, char *arg, char delim,
arg_ptr = strchr(arg_ptr + sizeof(const char), delim);
}
arg_split = calloc(num_strs, sizeof(char *));
arg_split = calloc(num_strs, sizeof(*arg_split));
if (arg_split == NULL) {
pam_syslog(pamh, LOG_CRIT, "failed to allocate string array");
goto out;
@ -201,11 +201,11 @@ static void try_to_display_directories_with_overrides(pam_handle_t *pamh,
goto out;
}
if ((dirscans = calloc(num_motd_dirs, sizeof(struct dirent **))) == NULL) {
if ((dirscans = calloc(num_motd_dirs, sizeof(*dirscans))) == NULL) {
pam_syslog(pamh, LOG_CRIT, "failed to allocate dirent arrays");
goto out;
}
if ((dirscans_sizes = calloc(num_motd_dirs, sizeof(int))) == NULL) {
if ((dirscans_sizes = calloc(num_motd_dirs, sizeof(*dirscans_sizes))) == NULL) {
pam_syslog(pamh, LOG_CRIT, "failed to allocate dirent array sizes");
goto out;
}
@ -228,7 +228,7 @@ static void try_to_display_directories_with_overrides(pam_handle_t *pamh,
goto out;
/* Allocate space for all file names found in the directories, including duplicates. */
if ((dirnames_all = calloc(dirscans_size_total, sizeof(char *))) == NULL) {
if ((dirnames_all = calloc(dirscans_size_total, sizeof(*dirnames_all))) == NULL) {
pam_syslog(pamh, LOG_CRIT, "failed to allocate dirname array");
goto out;
}