81 lines
2.0 KiB
Diff
81 lines
2.0 KiB
Diff
|
From 741e8fa0ee62563589870592071188d6391ead38 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Than Ngo <than@redhat.com>
|
||
|
|
Date: Sun, 21 Mar 2021 18:34:09 +0000
|
||
|
|
Subject: [PATCH] coverity fixes
|
||
|
|
|
||
|
|
---
|
||
|
|
tilde/tilde.c | 8 ++++----
|
||
|
|
which.c | 7 ++++---
|
||
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tilde/tilde.c b/tilde/tilde.c
|
||
|
|
index 1b76c9f..b393506 100644
|
||
|
|
--- a/tilde/tilde.c
|
||
|
|
+++ b/tilde/tilde.c
|
||
|
|
@@ -193,10 +193,10 @@ tilde_expand (string)
|
||
|
|
const char *string;
|
||
|
|
{
|
||
|
|
char *result;
|
||
|
|
- int result_size, result_index;
|
||
|
|
+ int result_size = 0, result_index = 0;
|
||
|
|
|
||
|
|
- result_index = result_size = 0;
|
||
|
|
- if (result = strchr (string, '~'))
|
||
|
|
+ result = strchr (string, '~');
|
||
|
|
+ if (result)
|
||
|
|
result = (char *)xmalloc (result_size = (strlen (string) + 16));
|
||
|
|
else
|
||
|
|
result = (char *)xmalloc (result_size = (strlen (string) + 1));
|
||
|
|
@@ -270,7 +270,7 @@ isolate_tilde_prefix (fname, lenp)
|
||
|
|
char *ret;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
- ret = (char *)xmalloc (strlen (fname));
|
||
|
|
+ ret = (char *)xmalloc (strlen (fname) + 1);
|
||
|
|
#if defined (__MSDOS__)
|
||
|
|
for (i = 1; fname[i] && fname[i] != '/' && fname[i] != '\\'; i++)
|
||
|
|
#else
|
||
|
|
diff --git a/which.c b/which.c
|
||
|
|
index 525c0d0..9f93021 100644
|
||
|
|
--- a/which.c
|
||
|
|
+++ b/which.c
|
||
|
|
@@ -81,16 +81,16 @@ static int skip_functions = 0, read_functions = 0;
|
||
|
|
|
||
|
|
static char *find_command_in_path(const char *name, const char *path_list, int *path_index)
|
||
|
|
{
|
||
|
|
- char *found = NULL, *full_path;
|
||
|
|
+ char *found = NULL, *full_path = NULL;
|
||
|
|
int status, name_len;
|
||
|
|
|
||
|
|
name_len = strlen(name);
|
||
|
|
+ char *p;
|
||
|
|
|
||
|
|
if (!absolute_program(name))
|
||
|
|
absolute_path_given = 0;
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- char *p;
|
||
|
|
absolute_path_given = 1;
|
||
|
|
|
||
|
|
if (abs_path)
|
||
|
|
@@ -164,6 +164,7 @@ static char *find_command_in_path(const char *name, const char *path_list, int *
|
||
|
|
free(full_path);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ name = NULL; p = NULL; path_list = NULL;
|
||
|
|
return (found);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -545,7 +546,7 @@ int main(int argc, char *argv[])
|
||
|
|
int function_start_type = 0;
|
||
|
|
if (read_alias || read_functions)
|
||
|
|
{
|
||
|
|
- char buf[1024];
|
||
|
|
+ char buf[1024] = {};
|
||
|
|
int processing_aliases = read_alias;
|
||
|
|
|
||
|
|
if (isatty(0))
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|