@@ -9,9 +9,9 @@ Version 2.22
* The following bugs are resolved with this release:
- 4719, 13064, 14094, 15319, 15467, 15790, 16560, 17569, 17588, 17792,
- 17912, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987,
- 17991, 17996, 17998, 17999.
+ 4719, 13064, 14094, 15319, 15467, 15790, 16560, 17269, 17569, 17588,
+ 17792, 17912, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17978,
+ 17987, 17991, 17996, 17998, 17999.
* Character encoding and ctype tables were updated to Unicode 7.0.0, using
new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red
@@ -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
On Sat, Feb 21, 2015 at 10:09 PM, Paul Pluzhnikov <ppluzhnikov@gmail.com> wrote: > Attached is a rather obvious fix for BZ #17269 Hmm, it seems the same problem could also happen in enlarge_userbuf. Also fixed "space before paren". 2015-02-21 Paul Pluzhnikov <ppluzhnikov@google.com> [BZ #17269] * NEWS: Mention 17269 * libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow (enlarge_userbuf): Likewise.