mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extmod/modwebrepl: Fix logic to handle a put of file of size 0. 

Fixes issue #4499.
This commit is contained in:
Damien George 2019-02-28 15:30:48 +11:00
parent ed1a88e263
commit 9b2a97a903
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extmod/modwebrepl.c
View File

@ -108,6 +108,15 @@ STATIC mp_obj_t webrepl_make_new(const mp_obj_type_t *type, size_t n_args, size_
return o; return o;
} }
STATIC void check_file_op_finished(mp_obj_webrepl_t *self) {
if (self->data_to_recv == 0) {
mp_stream_close(self->cur_file);
self->hdr_to_recv = sizeof(struct webrepl_file);
DEBUG_printf("webrepl: Finished file operation %d\n", self->hdr.type);
write_webrepl_resp(self->sock, 0);
}
}
STATIC int write_file_chunk(mp_obj_webrepl_t *self) { STATIC int write_file_chunk(mp_obj_webrepl_t *self) {
const mp_stream_p_t *file_stream = mp_get_stream(self->cur_file); const mp_stream_p_t *file_stream = mp_get_stream(self->cur_file);
byte readbuf[2 + 256]; byte readbuf[2 + 256];
@ -160,6 +169,7 @@ STATIC void handle_op(mp_obj_webrepl_t *self) {
if (self->hdr.type == PUT_FILE) { if (self->hdr.type == PUT_FILE) {
self->data_to_recv = self->hdr.size; self->data_to_recv = self->hdr.size;
check_file_op_finished(self);
} else if (self->hdr.type == GET_FILE) { } else if (self->hdr.type == GET_FILE) {
self->data_to_recv = 1; self->data_to_recv = 1;
} }
@ -266,12 +276,7 @@ STATIC mp_uint_t _webrepl_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
} }
} }
if (self->data_to_recv == 0) { check_file_op_finished(self);
mp_stream_close(self->cur_file);
self->hdr_to_recv = sizeof(struct webrepl_file);
DEBUG_printf("webrepl: Finished file operation %d\n", self->hdr.type);
write_webrepl_resp(self->sock, 0);
}
#ifdef MICROPY_PY_WEBREPL_DELAY #ifdef MICROPY_PY_WEBREPL_DELAY
// Some platforms may have broken drivers and easily gets // Some platforms may have broken drivers and easily gets