1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 79a59d59cd..435d1899e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-30  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	[BZ #17269]
+	* libio/wstrops.c (_IO_wstr_overflow): Guard against integer overflow
+	(enlarge_userbuf): Likewise.
+
 2015-12-30  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #18032]