OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix memory leaks in libio on allocation failure

This commit is contained in:
Allan McRae 2013-09-09 22:50:41 +10:00
parent 83e43bf0b7
commit 3932737df1
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2013-09-09 Allan McRae <allan@archlinux.org>
[BZ #15892]
* libio/memstream.c (open_memstream): Fix memory leak.
* libio/wmemstream.c (open_wmemstream): Likewise.
[BZ #15895]
* nscd/netgroupcache.c: Fix nesting of ifdefs.

2
NEWS
View File

@ -10,7 +10,7 @@ Version 2.19
* The following bugs are resolved with this release:
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
15867, 15886, 15887, 15890, 15895, 15897, 15905, 15909, 15921.
15867, 15886, 15887, 15890, 15892, 15895, 15897, 15905, 15909, 15921.
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
to the d_name member of struct dirent, or omit the terminating NUL

5
libio/memstream.c
View File

@ -84,7 +84,10 @@ open_memstream (bufloc, sizeloc)
buf = calloc (1, _IO_BUFSIZ);
if (buf == NULL)
return NULL;
{
free (new_f);
return NULL;
}
_IO_init (&new_f->fp._sf._sbf._f, 0);
_IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps;
_IO_str_init_static_internal (&new_f->fp._sf, buf, _IO_BUFSIZ, buf);

6
libio/wmemstream.c
View File

@ -85,8 +85,10 @@ open_wmemstream (bufloc, sizeloc)
buf = calloc (1, _IO_BUFSIZ);
if (buf == NULL)
return NULL;
{
free (new_f);
return NULL;
}
_IO_no_init (&new_f->fp._sf._sbf._f, 0, 0, &new_f->wd, &_IO_wmem_jumps);
_IO_fwide (&new_f->fp._sf._sbf._f, 1);
_IO_wstr_init_static (&new_f->fp._sf._sbf._f, buf,