diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2008-07-25 12:51:47 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2008-07-25 12:51:47 +0000 |
| commit | 1f7e547662939345f74ad8731b923b3927d0b6f2 (patch) | |
| tree | 1802edd9d25344c33b44d7be140b478ff0fea8e0 /ext/mbstring/mbstring.c | |
| parent | 7833cf9f10201d54860e635e325b182bb352ff2c (diff) | |
| download | php-git-1f7e547662939345f74ad8731b923b3927d0b6f2.tar.gz | |
- MFH: Fix a typo in mb_stripos() that caused segfaults (noticed by bs@php.net, thanks).
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 5b35c8cea9..6e2fd9fe37 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2392,10 +2392,13 @@ PHP_FUNCTION(mb_stripos) n = -1; offset = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls", (char **)&haystack.val, (int *)&haystack.len, (char **)needle.val, (int *)&needle.len, &offset, &from_encoding, &from_encoding_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls", (char **)&haystack.val, (int *)&haystack.len, (char **)&needle.val, (int *)&needle.len, &offset, &from_encoding, &from_encoding_len) == FAILURE) { + RETURN_FALSE; + } + if (needle.len == 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter."); RETURN_FALSE; } - n = php_mb_stripos(0, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, offset, from_encoding TSRMLS_CC); if (n >= 0) { |