archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fix issue in _php_stream_get_line(): Allow maxchars == 0 as macro

Browse source 
php_stream_get_line() does
This commit is contained in:
Marcus Boerger 2006-03-18 19:44:51 +00:00
parent 7fc0756e55
commit d7a4909ed2
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
main/streams/streams.c
View file

@ -1053,20 +1053,22 @@ PHPAPI void *_php_stream_get_line(php_stream *stream, int buf_type, zstr buf, si
}
if (is_unicode) {
int ulen = u_countChar32(readptr.u, cpysz);
if (maxchars) {
int ulen = u_countChar32(readptr.u, cpysz);
if (ulen > maxchars) {
int32_t i = 0;
if (ulen > maxchars) {
int32_t i = 0;
ulen = maxchars;
U16_FWD_N(readptr.u, i, cpysz, ulen);
cpysz = i;
ulen = maxchars;
U16_FWD_N(readptr.u, i, cpysz, ulen);
cpysz = i;
}
maxchars -= ulen;
}
maxchars -= ulen;
memcpy(buf.u, readptr.u, UBYTES(cpysz));
buf.u += cpysz;
} else {
if (cpysz > maxchars) {
if (maxchars && cpysz > maxchars) {
cpysz = maxchars;
}
memcpy(buf.s, readptr.s, cpysz);
@ -1105,10 +1107,12 @@ PHPAPI void *_php_stream_get_line(php_stream *stream, int buf_type, zstr buf, si
}
}
if (returned_len) {
*returned_len = total_copied;
}
if (total_copied == 0) {
if (grow_mode) {
assert(bufstart.v == NULL);
}
assert(bufstart.v != NULL || !grow_mode || stream->eof);
return NULL;
}