diff options
| author | Stanislav Malyshev <stas@php.net> | 2008-08-05 20:11:17 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2008-08-05 20:11:17 +0000 |
| commit | adf6be4bfbd6f7c7b3fee16c54dbff50a8db59c3 (patch) | |
| tree | 4650af3221bc2c836bd0e1ee308b8a5495832fef /Zend/zend_operators.h | |
| parent | ddcb5042f5993fa5a0a72060d36cd5ae8c31d4af (diff) | |
| download | php-git-adf6be4bfbd6f7c7b3fee16c54dbff50a8db59c3.tar.gz | |
fix memnstr bug, by Laurent Gaffie
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 2fa4097ec2..03a4ed35d4 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -220,6 +220,9 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end) char *p = haystack; char ne = needle[needle_len-1]; + if(needle_len > end-haystack) { + return NULL; + } end -= needle_len; while (p <= end) { |