- fixed coverity issues

- improved which2.sh
This commit is contained in:
Than Ngo 2021-03-21 14:30:10 +01:00
parent e3c52e8686
commit 88199b8014
3 changed files with 71 additions and 24 deletions

View File

@ -1,27 +1,65 @@
diff -up which-2.21/tilde/tilde.c.me which-2.21/tilde/tilde.c diff -up which-2.21/tilde/tilde.c.coverity which-2.21/tilde/tilde.c
--- which-2.21/tilde/tilde.c.me 2018-07-23 14:32:47.002225732 +0200 --- which-2.21/tilde/tilde.c.coverity 2008-01-16 18:51:57.000000000 +0100
+++ which-2.21/tilde/tilde.c 2018-07-23 14:49:06.363623898 +0200 +++ which-2.21/tilde/tilde.c 2021-03-21 11:43:00.338160051 +0100
@@ -196,7 +196,8 @@ tilde_expand (string) @@ -193,10 +193,10 @@ tilde_expand (string)
int result_size, result_index; const char *string;
{
char *result;
- int result_size, result_index;
+ int result_size = 0, result_index = 0;
result_index = result_size = 0; - result_index = result_size = 0;
- if (result = strchr (string, '~')) - if (result = strchr (string, '~'))
+ result = strchr (string, '~'); + result = strchr (string, '~');
+ if (result) + if (result)
result = (char *)xmalloc (result_size = (strlen (string) + 16)); result = (char *)xmalloc (result_size = (strlen (string) + 16));
else else
result = (char *)xmalloc (result_size = (strlen (string) + 1)); result = (char *)xmalloc (result_size = (strlen (string) + 1));
diff -up which-2.21/which.c.me which-2.21/which.c @@ -270,7 +270,7 @@ isolate_tilde_prefix (fname, lenp)
diff -up which-2.21/which.c.me which-2.21/which.c char *ret;
--- which-2.21/which.c.me 2018-07-23 15:09:04.355222509 +0200 int i;
+++ which-2.21/which.c 2018-07-25 14:57:43.696309701 +0200
@@ -671,6 +671,9 @@ int main(int argc, char *argv[]) - 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 -up which-2.21/which.c.coverity which-2.21/which.c
--- which-2.21/which.c.coverity 2015-03-19 17:50:24.000000000 +0100
+++ which-2.21/which.c 2021-03-21 12:19:31.289160885 +0100
@@ -76,16 +76,16 @@ static int skip_functions = 0, read_func
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)
@@ -159,6 +159,7 @@ static char *find_command_in_path(const
free(full_path);
} }
+ if (abs_path) + name = NULL; p = NULL; path_list = NULL;
+ free(abs_path); return (found);
+
return fail_count;
} }
@@ -540,7 +541,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))

View File

@ -1,7 +1,7 @@
Summary: Displays where a particular program in your path is located Summary: Displays where a particular program in your path is located
Name: which Name: which
Version: 2.21 Version: 2.21
Release: 22%{?dist} Release: 23%{?dist}
License: GPLv3 License: GPLv3
Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
Source1: which2.sh Source1: which2.sh
@ -40,6 +40,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%{_mandir}/man1/which.1* %{_mandir}/man1/which.1*
%changelog %changelog
* Sun Mar 21 2021 Than Ngo <than@redhat.com> - 2.21-23
- fixed coverity issues
- improved which2.sh
* Thu Mar 18 2021 Than Ngo <than@redhat.com> - 2.21-22 * Thu Mar 18 2021 Than Ngo <than@redhat.com> - 2.21-22
- fixed syntax error testcase: a=b which ls - fixed syntax error testcase: a=b which ls

View File

@ -1,11 +1,16 @@
# Initialization script for bash, sh, mksh and ksh # Initialization script for bash, sh, mksh and ksh
_declare="declare -f"
_opt="-f"
if [ "$0" = "ksh" ] || [ "$0" = "-ksh" ] || [ "$0" = "mksh" ] || [ "$0" = "-mksh" ] ; then
_declare="typeset -f"
_opt=""
fi
which () which ()
{ {
if [ "$0" = "ksh" -o "$0" = "-ksh" -o "$0" = "mksh" -o "$0" = "-mksh" ] ; then (alias; eval ${_declare}) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot "$@"
(alias; typeset -f) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot $@
export which
else
(alias; declare -f) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot $@
export -f which
fi
} }
export ${_opt} which