diff options
author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-07 16:34:37 +0100 |
---|---|---|
committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-04-07 16:34:37 +0100 |
commit | bd5f52fd94148b97114e400962c44c29a44694c2 (patch) | |
tree | 6f5a97629552944dc5bba0a80fec8a3ef45e16e5 | |
parent | 7497aa9c4e48635b06b7688ecd5c1a9d32b017d4 (diff) | |
parent | f7d407678570f8e4063b70bd30f3fc19c10442ea (diff) | |
download | php-git-bd5f52fd94148b97114e400962c44c29a44694c2.tar.gz |
Merge branch '5.4'
-rw-r--r-- | ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt | 27 | ||||
-rwxr-xr-x | main/streams/streams.c | 4 |
2 files changed, 29 insertions, 2 deletions
diff --git a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt new file mode 100644 index 0000000000..32756d7618 --- /dev/null +++ b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt @@ -0,0 +1,27 @@ +--TEST-- +Bug #60455: stream_get_line and \0 as a delimiter +--FILE-- +<?php +class TestStream { + private $s = 0; + function stream_open($path, $mode, $options, &$opened_path) { + return true; + } + function stream_read($count) { + if ($this->s++ == 0) + return "a\0"; + + return ""; + } + function stream_eof() { + return $this->s >= 2; + } + +} + +stream_wrapper_register("test", "TestStream"); + +$f = fopen("test://", "r"); +var_dump(stream_get_line($f, 100, "\0")); +--EXPECT-- +string(1) "a" diff --git a/main/streams/streams.c b/main/streams/streams.c index b623ffb201..35580739cb 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1023,8 +1023,8 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re char *ret_buf, /* returned buffer */ *found_delim = NULL; size_t buffered_len, - tent_ret_len; /* tentative returned length*/ - int has_delim = delim_len > 0 && delim[0] != '\0'; + tent_ret_len; /* tentative returned length */ + int has_delim = delim_len > 0; if (maxlen == 0) { return NULL; |