]> granicus.if.org Git - php/commitdiff
Fix bug #72221 (segfault, past-the-end access)
authorLauri Kenttä <lauri.kentta@gmail.com>
Sat, 21 May 2016 15:46:00 +0000 (18:46 +0300)
committerLauri Kenttä <lauri.kentta@gmail.com>
Sat, 21 May 2016 15:46:00 +0000 (18:46 +0300)
Zend/zend_operators.c

index f47a14856450e1bdb9d95b15137f9991a4f1e8d6..8eb9a7b637e277de9120197df70f831eaa25e3cc 100644 (file)
@@ -2965,6 +2965,9 @@ ZEND_API const char* ZEND_FASTCALL zend_memnstr_ex(const char *haystack, const c
                if (i == needle_len) {
                        return p;
                }
+               if (UNEXPECTED(p == end)) {
+                       return NULL;
+               }
                p += td[(unsigned char)(p[needle_len])];
        }