[newlib-cygwin] string: Fix buffer overrun in picolibc/newlib/libc/string/strrchr.c (#184)

[newlib-cygwin] string: Fix buffer overrun in picolibc/newlib/libc/string/strrchr.c (#184)

[Jeff Johnston]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c51f05c59799fd03b15874a9608e613315dcb11c

commit c51f05c59799fd03b15874a9608e613315dcb11c
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Oct 11 09:24:54 2021 -0700

    string: Fix buffer overrun in picolibc/newlib/libc/string/strrchr.c (#184)
    
    Reported by prodisDown:
    
            In picolibc/newlib/libc/string/strrchr.c
    
            if (i) { while ((s=strchr(s, i))) { last = s; s++; } } else { last = strchr(s, i); }
    
            Value (for example 0xFFFFFF00) in if (i) can pass test and
            then be typecasted to char inside strchr(). Then s++ and then
            buffer overrun.
    
            It can be fixed by preventive typecast i = (int) (char) i; or
            typecasting inside expression if ((char) i).
    
    Fixed by casting to char.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

Diff:
---
 newlib/libc/string/strrchr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 04897e162..35a7060d2 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -34,10 +34,11 @@ strrchr (const char *s,
 	int i)
 {
   const char *last = NULL;
+  char c = i;
 
-  if (i)
+  if (c)
     {
-      while ((s=strchr(s, i)))
+      while ((s=strchr(s, c)))
 	{
 	  last = s;
 	  s++;
@@ -45,8 +46,8 @@ strrchr (const char *s,
     }
   else
     {
-      last = strchr(s, i);
+      last = strchr(s, c);
     }
-		  
+
   return (char *) last;
 }