mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

Mikael: 27362: some more attr fixes

Browse source
This commit is contained in:
Peter Stephenson 2009-11-07 23:57:27 +00:00
parent bce9aa947d
commit a3055b2363
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,7 @@
2009-11-07 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Mikael: 27362: Src/Modules/attr.c: some more fixes.
2009-11-07 Clint Adams <clint@zsh.org>
* Frank Terbeck: 27359: Completion/Unix/Command/.distfiles,
@ -12313,5 +12317,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4805 $
* $Revision: 1.4806 $
*****************************************************

12
Src/Modules/attr.c
View file

@ -98,7 +98,7 @@ static int
bin_getattr(char *nam, char **argv, Options ops, UNUSED(int func))
{
int ret = 0;
int list_len, val_len, attr_len, slen;
int list_len, val_len = 0, attr_len = 0, slen;
char *value, *file = argv[0], *attr = argv[1], *param = argv[2];
int symlink = OPT_ISSET(ops, 'h');
@ -125,9 +125,9 @@ bin_getattr(char *nam, char **argv, Options ops, UNUSED(int func))
zfree(value, val_len+1);
}
}
if (list_len < 0 || val_len < 0 || attr_len < 0) {
if (list_len < 0 || val_len < 0 || attr_len < 0 || attr_len > val_len) {
zwarnnam(nam, "%s: %e", metafy(file, slen, META_NOALLOC), errno);
ret = 1 + (attr_len > val_len);
ret = 1 + (attr_len > val_len || attr_len < 0);
}
return ret;
}
@ -172,7 +172,7 @@ static int
bin_listattr(char *nam, char **argv, Options ops, UNUSED(int func))
{
int ret = 0;
int val_len, list_len, slen;
int val_len, list_len = 0, slen;
char *value, *file = argv[0], *param = argv[1];
int symlink = OPT_ISSET(ops, 'h');
@ -214,9 +214,9 @@ bin_listattr(char *nam, char **argv, Options ops, UNUSED(int func))
}
zfree(value, val_len+1);
}
if (val_len < 0 || list_len < 0) {
if (val_len < 0 || list_len < 0 || list_len > val_len) {
zwarnnam(nam, "%s: %e", metafy(file, slen, META_NOALLOC), errno);
ret = 1 + (list_len > val_len);
ret = 1 + (list_len > val_len || list_len < 0);
}
return ret;
}