[Valgrind-developers] [valgrind] Fix n-i-bz fix bug in strspn replacement

[Philippe W. <phi...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=c1eace647ca4f670ef9bec0d0fe72cdd25a96394

commit c1eace647ca4f670ef9bec0d0fe72cdd25a96394
Author: Philippe Waroquiers <phi...@sk...>
Date:   Thu Oct 26 20:53:15 2017 +0200

    Fix n-i-bz  fix bug in strspn replacement
    
    Mix-up between UChar and HChar in strspn.
    Also grouped together the n-i-bz announded fixes in NEWS

Diff:
---
 NEWS                       | 4 +++-
 shared/vg_replace_strmem.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 11055cf..3bb9ba2 100644
--- a/NEWS
+++ b/NEWS
@@ -57,7 +57,6 @@ where XXXXXX is the bug number as listed below.
 384096  Mention AddrCheck at Memcheck's command line option --undef-value-errors=no
 384526  reduce number of spill instructions generated by VEX register allocator v3
 384584  Callee saved registers listed first for AMD64, X86, and PPC architectures
-n-i-bz  Fix missing workq_ops operations (macOS)
 384987  VEX register allocator: allocate caller-save registers for short lived vregs
 385182  PPC64 is missing support for the DSCR
 385207  PPC64, generate_store_FPRF() generates too many Iops
@@ -68,6 +67,9 @@ n-i-bz  Fix missing workq_ops operations (macOS)
 385868  glibc ld.so _dl_runtime_resolve_avx_slow conditional jump warning.
 385912  none/tests/rlimit_nofile fails on newer glibc/kernel.
 
+n-i-bz  Fix missing workq_ops operations (macOS)
+n-i-bz  fix bug in strspn replacement
+
 Release 3.13.0 (15 June 2017)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index f2875fc..71c7e56 100644
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -1750,7 +1750,7 @@ static inline void my_exit ( int x )
       UWord len = 0; \
       while (1) { \
          UWord i; \
-         HChar sc = *s; \
+         UChar sc = *s; \
          if (sc == 0) \
             break; \
          for (i = 0; i < nacc; i++) { \