1 files changed, 8 insertions, 6 deletions
diff --git a/nnn.c b/nnn.c
index 1a28e99..0fe5866 100644
--- a/nnn.c
+++ b/nnn.c
@@ -433,17 +433,19 @@ xstrcmp(const char *s1, const char *s2)
 static void *
 xmemrchr(uchar *s, uchar ch, size_t n)
 {
+	static uchar *ptr;
+
 	if (!s || !n)
 		return NULL;
 
-	s = s + n - 1;
+	ptr = s + n;
 
-	while (n) {
-		if (*s == ch)
-			return s;
+	do {
+		--ptr;
 
-		--n, --s;
-	}
+		if (*ptr == ch)
+			return ptr;
+	} while (s != ptr);
 
 	return NULL;
 }