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

43790: failed mailstat could leak memory

Browse source
This commit is contained in:
Kamil Dudka 2018-11-07 14:04:56 +01:00 committed by Peter Stephenson
parent e27175c7c8
commit d50e204b0c
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2018-11-09 Peter Stephenson <p.stephenson@samsung.com> 2018-11-09 Peter Stephenson <p.stephenson@samsung.com>
* 43790: Kamil: Src/utils.c: failed mailstat could leak memory.
* 43789: Kamil: Src/module.c: possible use after free handling * 43789: Kamil: Src/module.c: possible use after free handling
math functions from module. math functions from module.

16
Src/utils.c
View file

@ -7459,19 +7459,28 @@ mailstat(char *path, struct stat *st)
/* See if cur/ is present */ /* See if cur/ is present */
dir = appstr(ztrdup(path), "/cur"); dir = appstr(ztrdup(path), "/cur");
if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0; if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) {
zsfree(dir);
return 0;
}
st_ret.st_atime = st_tmp.st_atime; st_ret.st_atime = st_tmp.st_atime;
/* See if tmp/ is present */ /* See if tmp/ is present */
dir[plen] = 0; dir[plen] = 0;
dir = appstr(dir, "/tmp"); dir = appstr(dir, "/tmp");
if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0; if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) {
zsfree(dir);
return 0;
}
st_ret.st_mtime = st_tmp.st_mtime; st_ret.st_mtime = st_tmp.st_mtime;
/* And new/ */ /* And new/ */
dir[plen] = 0; dir[plen] = 0;
dir = appstr(dir, "/new"); dir = appstr(dir, "/new");
if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0; if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) {
zsfree(dir);
return 0;
}
st_ret.st_mtime = st_tmp.st_mtime; st_ret.st_mtime = st_tmp.st_mtime;
#if THERE_IS_EXACTLY_ONE_MAILDIR_IN_MAILPATH #if THERE_IS_EXACTLY_ONE_MAILDIR_IN_MAILPATH
@ -7483,6 +7492,7 @@ mailstat(char *path, struct stat *st)
st_tmp.st_atime == st_new_last.st_atime && st_tmp.st_atime == st_new_last.st_atime &&
st_tmp.st_mtime == st_new_last.st_mtime) { st_tmp.st_mtime == st_new_last.st_mtime) {
*st = st_ret_last; *st = st_ret_last;
zsfree(dir);
return 0; return 0;
} }
st_new_last = st_tmp; st_new_last = st_tmp;