From 698ea5f48eefa22df5d6553817ef69462f2c0408 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 20 Dec 2006 19:08:48 +0000 Subject: [PATCH] MFH --- Zend/zend_operators.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index e643ccdc59..36b815bfd6 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -171,9 +171,13 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end) static inline void *zend_memrchr(const void *s, int c, size_t n) { - register unsigned char *e = (unsigned char *)s + n; + register unsigned char *e; - for (e--; e >= (unsigned char *)s; e--) { + if (n <= 0) { + return NULL; + } + + for (e = (unsigned char *)s + n - 1; e >= (unsigned char *)s; e--) { if (*e == (unsigned char)c) { return (void *)e; } -- 2.50.1