com php-src: Fix bug #72221 (segfault, past-the-end access): Zend/zend_operators.c

From: Date: Sat, 21 May 2016 15:46:00 +0000
Subject: com php-src: Fix bug #72221 (segfault, past-the-end access): Zend/zend_operators.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92229@lists.php.net to get a copy of this message
Commit: 26fa27d760c7b119805ba6d9db624f479d9b9fc8 Author: Lauri Kenttä <lauri.kentta@gmail.com> Sat, 21 May 2016 18:46:00 +0300 Parents: 4f077aee836ad7d8335cf62629a8364bdf939db9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26fa27d760c7b119805ba6d9db624f479d9b9fc8 Log: Fix bug #72221 (segfault, past-the-end access) Bugs: https://bugs.php.net/72221 Changed paths: M Zend/zend_operators.c Diff: diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index f47a148..8eb9a7b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -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])]; }

« previous php.cvs (#92229) next »