about summary refs log tree commit diff
path: root/libio/wstrops.c
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2015-02-22 12:01:47 -0800
committerPaul Pluzhnikov <ppluzhnikov@google.com>2015-02-22 12:01:47 -0800
commitbdf1ff052a8e23d637f2c838fa5642d78fcedc33 (patch)
treeef595b80d3cf6d43a806b5bde425fcef434ac56a /libio/wstrops.c
parent9529611240b612fec59e289673d05f83396aede4 (diff)
downloadglibc-bdf1ff052a8e23d637f2c838fa5642d78fcedc33.tar.gz
glibc-bdf1ff052a8e23d637f2c838fa5642d78fcedc33.tar.xz
glibc-bdf1ff052a8e23d637f2c838fa5642d78fcedc33.zip
Fix BZ #17269 -- _IO_wstr_overflow integer overflow
Diffstat (limited to 'libio/wstrops.c')
-rw-r--r--libio/wstrops.c8
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