diff options
| author | Stanislav Malyshev <stas@php.net> | 2008-08-05 20:14:27 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2008-08-05 20:14:27 +0000 |
| commit | 4bd1aec2f90330ed9c9b0ef05855a64f48a21990 (patch) | |
| tree | e59b6886d3b861491e91377b987a831292b0a026 /Zend/zend_operators.h | |
| parent | 613cb60f8f6a4f6fddcd1ab6e7d47da045d680da (diff) | |
| download | php-git-4bd1aec2f90330ed9c9b0ef05855a64f48a21990.tar.gz | |
fix memnstr bug, by Laurent Gaffie
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 536d27689e..b75a0cbc8d 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -224,6 +224,10 @@ zend_memnstr(char *haystack, char *needle, int needle_len, char *end) return (char *)memchr(p, *needle, (end-p)); } + if(needle_len > end-haystack) { + return NULL; + } + end -= needle_len; while (p <= end) { |