RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-19 14:26:57 +00:00
Code Issues Releases Wiki Activity

stream: stop accessing buffer internals in stream_read_line()

Browse Source 
Getting this out of the way in preparation for reworking stream
internals.
This commit is contained in:
wm4 2019-10-26 16:41:46 +02:00
parent be4996e312
commit c6b08d222f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
stream/stream.c
View File

@ -496,6 +496,16 @@ struct bstr stream_peek(stream_t *s, int len)
return (bstr){.start = &s->buffer[s->buf_pos], .len = MPMIN(len, avail)};
}
// Peek the current buffer. This will return at least 1 byte, unless EOF was
// reached. If data is returned, the length is essentially random.
struct bstr stream_peek_buffer(stream_t *s)
{
if (s->buf_len - s->buf_pos < 1)
stream_fill_buffer(s);
return (bstr){.start = &s->buffer[s->buf_pos],
.len = s->buf_len - s->buf_pos};
}
int stream_write_buffer(stream_t *s, unsigned char *buf, int len)
{
if (!s->write_buffer)
@ -676,16 +686,13 @@ static int read_characters(stream_t *s, uint8_t *dst, int dstsize, int utf16)
}
return cur - dst;
} else {
if (s->buf_pos >= s->buf_len)
stream_fill_buffer(s);
uint8_t *src = s->buffer + s->buf_pos;
int src_len = s->buf_len - s->buf_pos;
uint8_t *end = memchr(src, '\n', src_len);
int len = end ? end - src + 1 : src_len;
bstr buf = stream_peek_buffer(s);
uint8_t *end = memchr(buf.start, '\n', buf.len);
int len = end ? end - buf.start + 1 : buf.len;
if (len > dstsize)
return -1; // line too long
memcpy(dst, src, len);
s->buf_pos += len;
memcpy(dst, buf.start, len);
stream_skip(s, len);
return len;
}
}

1
stream/stream.h
View File

@ -180,6 +180,7 @@ bool stream_seek(stream_t *s, int64_t pos);
int stream_read(stream_t *s, char *mem, int total);
int stream_read_partial(stream_t *s, char *buf, int buf_size);
struct bstr stream_peek(stream_t *s, int len);
struct bstr stream_peek_buffer(stream_t *s);
void stream_drop_buffers(stream_t *s);
int64_t stream_get_size(stream_t *s);