upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-02-14 08:13:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2045 from RincewindsHat/fix/calloc_argument_order

Browse source 
Fix argument order of calloc on several occasions
This commit is contained in:
Lorenz Kästle 2024-11-09 11:31:48 +01:00 committed by GitHub
commit ed52a7dbb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/utils_cmd.c
View file

@ -290,7 +290,7 @@ int cmd_run(const char *cmdstring, output *out, output *err, int flags) {
/* each arg must be whitespace-separated, so args can be a maximum
* of (len / 2) + 1. We add 1 extra to the mix for NULL termination */
argc = (cmdlen >> 1) + 2;
argv = calloc(sizeof(char *), argc);
argv = calloc((size_t)argc, sizeof(char *));
if (argv == NULL) {
printf("%s\n", _("Could not malloc argv array in popen()"));

2
plugins/check_tcp.c
View file

@ -119,7 +119,7 @@ int main(int argc, char **argv) {
/* set up a reasonable buffer at first (will be realloc()'ed if
* user specifies other options) */
server_expect = calloc(sizeof(char *), 2);
server_expect = calloc(2, sizeof(char *));
/* determine defaults for this service's protocol */
if (!strncmp(SERVICE, "UDP", 3)) {

2
plugins/runcmd.c
View file

@ -130,7 +130,7 @@ static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
/* each arg must be whitespace-separated, so args can be a maximum
* of (len / 2) + 1. We add 1 extra to the mix for NULL termination */
argc = (cmdlen >> 1) + 2;
argv = calloc(sizeof(char *), argc);
argv = calloc(argc, sizeof(char *));
if (argv == NULL) {
printf("%s\n", _("Could not malloc argv array in popen()"));

2
plugins/utils.c
View file

@ -185,7 +185,7 @@ bool is_percentage_expression(const char str[]) {
return false;
}
char *foo = calloc(sizeof(char), len + 1);
char *foo = calloc(len + 1, sizeof(char));
if (!foo) {
die(STATE_UNKNOWN, _("calloc failed \n"));