diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-07-26 16:32:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-07-26 16:32:59 +0000 |
| commit | 1311b164df26ee49740b805d4f32fffde163b1e6 (patch) | |
| tree | 4ef22736c806bfb7c9d3129718581c86a88946cb | |
| parent | ff0bf75374401cd3a726d209198dca4af272b1c2 (diff) | |
| download | glibc-1311b164df26ee49740b805d4f32fffde163b1e6.tar.gz glibc-1311b164df26ee49740b805d4f32fffde163b1e6.tar.xz glibc-1311b164df26ee49740b805d4f32fffde163b1e6.zip | |
* stdio-common/printf_fp.c (___printf_fp): Give wide outout code
the same treatment as narow output code in last patch.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/powerpc/tcb-offsets.sym | 2 | ||||
| -rw-r--r-- | stdio-common/printf_fp.c | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index be35b3f2c2..385fac7da7 100644 --- 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 eda43dce8e..8ac133dfd0 100644 --- 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 d63be7f92d..43c43c2039 100644 --- 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; |