* stdio-common/printf_fp.c (___printf_fp): Give wide outout code

	the same treatment as narow output code in last patch.

diff --git a/ChangeLog b/ChangeLog
index be35b3f2c2e6561d016a81b50c02697f6e536935..385fac7da7acf2571c3c3cfa6b8521c6c181d623 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * stdio-common/printf_fp.c (___printf_fp): Give wide outout code
+       the same treatment as narow output code in last patch.
+
        * sunrpc/clnt_udp.c (__libc_clntudp_bufcreate): Namespace cleanup.
 
        * elf/dl-load.c (local_strdup): Remove inline.

diff --git a/nptl/sysdeps/powerpc/tcb-offsets.sym b/nptl/sysdeps/powerpc/tcb-offsets.sym
index eda43dce8e70f058c49b4617ab4697129a9d2318..8ac133dfd075041c02d442579e2b30aba25900c3 100644 (file)
--- a/nptl/sysdeps/powerpc/tcb-offsets.sym
+++ b/nptl/sysdeps/powerpc/tcb-offsets.sym
@@ -15,4 +15,6 @@ MULTIPLE_THREADS_OFFSET               thread_offsetof (header.multiple_threads)
 PID                            thread_offsetof (pid)
 TID                            thread_offsetof (tid)
 POINTER_GUARD                  (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t))
+#ifndef __ASSUME_PRIVATE_FUTEX
 PRIVATE_FUTEX_OFFSET           thread_offsetof (header.private_futex)
+#endif

diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index d63be7f92d123e10041c8ce8ea5fdcdfa0eda6d8..43c43c20390759df75731856d0068a606b3291ff 100644 (file)
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -1204,6 +1204,10 @@ ___printf_fp (FILE *fp,
 #ifdef COMPILE_WPRINTF
          wstartp = _i18n_number_rewrite (wstartp, wcp,
                                          wbuffer + wbuffer_to_alloc);
+         wcp = wbuffer + wbuffer_to_alloc;
+         assert ((uintptr_t) wbuffer <= (uintptr_t) wstartp);
+         assert ((uintptr_t) wstartp
+                 < (uintptr_t) wbuffer + wbuffer_to_alloc);
 #else
          tmpptr = _i18n_number_rewrite (tmpptr, cp, buffer_end);
          cp = buffer_end;