diff options
| author | Allan McRae <allan@archlinux.org> | 2013-09-09 22:50:41 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-09-09 22:52:25 +1000 |
| commit | 3932737df1a022f8f207db9874194600296ed437 (patch) | |
| tree | 5ab4281b4df9bf6471c2c83ac4e35019c077b530 /libio | |
| parent | 83e43bf0b756065dc640680d90fa6f0b39425182 (diff) | |
| download | glibc-3932737df1a022f8f207db9874194600296ed437.zip glibc-3932737df1a022f8f207db9874194600296ed437.tar.gz glibc-3932737df1a022f8f207db9874194600296ed437.tar.bz2 | |
Fix memory leaks in libio on allocation failure
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/memstream.c | 5 | ||||
| -rw-r--r-- | libio/wmemstream.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libio/memstream.c b/libio/memstream.c index 34534e2..3cb1bd7 100644 --- a/libio/memstream.c +++ b/libio/memstream.c @@ -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); diff --git a/libio/wmemstream.c b/libio/wmemstream.c index 65738d4..fd7fe44 100644 --- a/libio/wmemstream.c +++ b/libio/wmemstream.c @@ -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, |