diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-20 16:24:31 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-20 16:24:31 +0200 |
| commit | 6aaab9adf7619c121c19701022aeb8d88f9c3bab (patch) | |
| tree | 531c292fdae6364f73f141759788a626888238d8 /Zend/zend_operators.h | |
| parent | 50978128f50eb5fa5920aea8a19a5855059a87c7 (diff) | |
| parent | 6165c23475d5020cda3794cb684693a7fab9918d (diff) | |
| download | php-git-6aaab9adf7619c121c19701022aeb8d88f9c3bab.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 5fe7ed6608..59693e00bc 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -225,10 +225,12 @@ zend_memnrstr(const char *haystack, const char *needle, size_t needle_len, const p -= needle_len; do { - if ((p = (const char *)zend_memrchr(haystack, *needle, (p - haystack) + 1)) && ne == p[needle_len-1]) { - if (!memcmp(needle + 1, p + 1, needle_len - 2)) { - return p; - } + p = (const char *)zend_memrchr(haystack, *needle, (p - haystack) + 1); + if (!p) { + return NULL; + } + if (ne == p[needle_len-1] && !memcmp(needle + 1, p + 1, needle_len - 2)) { + return p; } } while (p-- >= haystack); |