From 63e952d9be87db68f0e4164d4a5760b32e77ebff Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Wed, 12 Aug 2015 23:51:04 -0700 Subject: Fix BZ #18820 -- fmemopen may leak memory on failure. --- libio/fmemopen.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'libio/fmemopen.c') diff --git a/libio/fmemopen.c b/libio/fmemopen.c index 3ab3e8dac4..66e2d833ee 100644 --- a/libio/fmemopen.c +++ b/libio/fmemopen.c @@ -149,6 +149,7 @@ __fmemopen (void *buf, size_t len, const char *mode) { cookie_io_functions_t iof; fmemopen_cookie_t *c; + FILE *result; c = (fmemopen_cookie_t *) calloc (sizeof (fmemopen_cookie_t), 1); if (c == NULL) @@ -209,7 +210,16 @@ __fmemopen (void *buf, size_t len, const char *mode) iof.seek = fmemopen_seek; iof.close = fmemopen_close; - return _IO_fopencookie (c, mode, iof); + result = _IO_fopencookie (c, mode, iof); + if (__glibc_unlikely (result == NULL)) + { + if (c->mybuffer) + free (c->buffer); + + free (c); + } + + return result; } libc_hidden_def (__fmemopen) versioned_symbol (libc, __fmemopen, fmemopen, GLIBC_2_22); -- cgit v1.2.3