mirrors/micropython
1
0
Fork 0
mirror of https://github.com/licsber/micropython.git synced 2024-09-20 09:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

stream: Fix readall() implementation in respect to NUL terminator bytes.

Browse Source 
After vstr refactor. Fixes #1084.
This commit is contained in:
Paul Sokolovsky 2015-01-23 17:58:05 +02:00
parent 220d21e1bf
commit 425f952a1e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/stream.c
View File

@ -255,7 +255,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
vstr_t vstr; vstr_t vstr;
vstr_init(&vstr, DEFAULT_BUFFER_SIZE); vstr_init(&vstr, DEFAULT_BUFFER_SIZE);
char *p = vstr.buf; char *p = vstr.buf;
mp_uint_t current_read = DEFAULT_BUFFER_SIZE - 1; // save 1 byte for null termination mp_uint_t current_read = DEFAULT_BUFFER_SIZE;
while (true) { while (true) {
int error; int error;
mp_uint_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error); mp_uint_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error);
@ -280,7 +280,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
p += out_sz; p += out_sz;
} else { } else {
p = vstr_extend(&vstr, DEFAULT_BUFFER_SIZE); p = vstr_extend(&vstr, DEFAULT_BUFFER_SIZE);
current_read = DEFAULT_BUFFER_SIZE - 1; // save 1 byte for null termination current_read = DEFAULT_BUFFER_SIZE;
if (p == NULL) { if (p == NULL) {
// TODO // TODO
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError/*&mp_type_RuntimeError*/, "Out of memory")); nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError/*&mp_type_RuntimeError*/, "Out of memory"));
@ -289,7 +289,6 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
} }
vstr.len = total_size; vstr.len = total_size;
vstr.buf[vstr.len] = '\0';
return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(o->type->stream_p), &vstr); return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(o->type->stream_p), &vstr);
} }