From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 13 Mar 2019 10:23:28 +0000 (+0100)
Subject: string: avoid undefined behavior in strrchr()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=592b5fcb984487f1929d28e1f4eb49d25c2c719d;p=people%2Fliuw%2Fxen.git

string: avoid undefined behavior in strrchr()

The pre-decrement would not only cause misbehavior when wrapping (benign
because there shouldn't be any NULL pointers passed in), but may also
create a pointer pointing outside the object that the passed in pointer
points to (it won't be de-referenced though).

Take the opportunity and also
- convert bogus space (partly 7 of them) indentation to Linux style tab
  one,
- add two blank lines.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/common/string.c b/xen/common/string.c
index 1e122abca8..b8639dd30d 100644
--- a/xen/common/string.c
+++ b/xen/common/string.c
@@ -174,12 +174,13 @@ char *(strchr)(const char *s, int c)
  */
 char *(strrchr)(const char *s, int c)
 {
-       const char *p = s + strlen(s);
-       do {
-           if (*p == (char)c)
-               return (char *)p;
-       } while (--p >= s);
-       return NULL;
+	const char *p = s + strlen(s);
+
+	for (; *p != (char)c; --p)
+		if (p == s)
+			return NULL;
+
+	return (char *)p;
 }
 #endif