From 9f558b80513ba1314671ccc90620285a8eea6990 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 20 Jul 2008 08:49:18 +0000
Subject: * locale/setlocale.c (setlocale): Take the setlocale lock earlier.

---
 stdio-common/vfprintf.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'stdio-common')

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 78a1c77..714c76c 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -2080,8 +2080,11 @@ _IO_helper_overflow (_IO_FILE *s, int c)
     {
       _IO_size_t written = _IO_sputn (target, s->_wide_data->_IO_write_base,
 				      used);
-      if (written == 0)
+      if (written == 0 || written == WEOF)
 	return WEOF;
+      __wmemmove (s->_wide_data->_IO_write_base,
+		  s->_wide_data->_IO_write_base + written,
+		  used - written);
       s->_wide_data->_IO_write_ptr -= written;
     }
 #else
@@ -2089,8 +2092,10 @@ _IO_helper_overflow (_IO_FILE *s, int c)
   if (used)
     {
       _IO_size_t written = _IO_sputn (target, s->_IO_write_base, used);
-      if (written == 0)
+      if (written == 0 || written == EOF)
 	return EOF;
+      memmove (s->_IO_write_base, s->_IO_write_base + written,
+	       used - written);
       s->_IO_write_ptr -= written;
     }
 #endif
-- 
cgit v1.1