diff options
| author | Adam Harvey <aharvey@php.net> | 2012-03-02 03:39:04 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2012-03-02 03:39:04 +0000 |
| commit | 03f3d03ce0ec37b5e7713bb80c8a7ed4733b2f44 (patch) | |
| tree | 4421a2c8deaa6482c8face5fd62b064d07ee681c /ext/standard/string.c | |
| parent | 949ef40139a008c9bbf387a677018f3a85fbf75a (diff) | |
| download | php-git-03f3d03ce0ec37b5e7713bb80c8a7ed4733b2f44.tar.gz | |
MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934).
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 56c9d48e94..e3fc27e7e2 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5240,7 +5240,7 @@ PHP_FUNCTION(strpbrk) { char *haystack, *char_list; int haystack_len, char_list_len; - char *p; + char *haystack_ptr, *cl_ptr; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &haystack, &haystack_len, &char_list, &char_list_len) == FAILURE) { RETURN_FALSE; @@ -5251,11 +5251,15 @@ PHP_FUNCTION(strpbrk) RETURN_FALSE; } - if ((p = strpbrk(haystack, char_list))) { - RETURN_STRINGL(p, (haystack + haystack_len - p), 1); - } else { - RETURN_FALSE; + for (haystack_ptr = haystack; haystack_ptr < (haystack + haystack_len); ++haystack_ptr) { + for (cl_ptr = char_list; cl_ptr < (char_list + char_list_len); ++cl_ptr) { + if (*cl_ptr == *haystack_ptr) { + RETURN_STRINGL(haystack_ptr, (haystack + haystack_len - haystack_ptr), 1); + } + } } + + RETURN_FALSE; } /* }}} */ |