diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2015-02-22 12:01:47 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-07-20 23:24:39 -0400 |
| commit | 15ec5f09005dd20b65d0a5de3afba391707bce2f (patch) | |
| tree | 833e318c45afe3910bfe7036f508f6c3cb02c59f | |
| parent | 5af500db3c6abef8810253e51d428b406f24320d (diff) | |
| download | glibc-15ec5f09005dd20b65d0a5de3afba391707bce2f.tar.gz glibc-15ec5f09005dd20b65d0a5de3afba391707bce2f.tar.xz glibc-15ec5f09005dd20b65d0a5de3afba391707bce2f.zip | |
Fix BZ #17269 -- _IO_wstr_overflow integer overflow
(cherry picked from commit bdf1ff052a8e23d637f2c838fa5642d78fcedc33) (cherry picked from commit 8a4e5cc6574a419d5724bef6be98d705d58db48d)
| -rw-r--r-- | libio/wstrops.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libio/wstrops.c b/libio/wstrops.c index 43d847d034..3993579bd1 100644 --- a/libio/wstrops.c +++ b/libio/wstrops.c @@ -95,8 +95,11 @@ _IO_wstr_overflow (fp, c) wchar_t *old_buf = fp->_wide_data->_IO_buf_base; size_t old_wblen = _IO_wblen (fp); _IO_size_t new_size = 2 * old_wblen + 100; - if (new_size < old_wblen) + + if (__glibc_unlikely (new_size < old_wblen) + || __glibc_unlikely (new_size > SIZE_MAX / sizeof (wchar_t))) return EOF; + new_buf = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size * sizeof (wchar_t)); @@ -186,6 +189,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading) return 1; _IO_size_t newsize = offset + 100; + if (__glibc_unlikely (newsize > SIZE_MAX / sizeof (wchar_t))) + return 1; + wchar_t *oldbuf = wd->_IO_buf_base; wchar_t *newbuf = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize |