Change memory allocation API to require size for free and realloc.

3 files changed, 3 insertions, 3 deletions

diff --git a/stm/lexerstm.c b/stm/lexerstm.c
index 4e9905224..dfb84cca1 100644
--- a/stm/lexerstm.c
+++ b/stm/lexerstm.c
@@ -17,7 +17,7 @@ unichar str_buf_next_char(mp_lexer_str_buf_t *sb) {
 
 void str_buf_free(mp_lexer_str_buf_t *sb) {
     if (sb->free) {
-        m_free((char*)sb->src_beg);
+        m_del(char, (char*)sb->src_beg, 0 /* don't know allocated size of src */);
     }
 }
 
diff --git a/stm/main.c b/stm/main.c
index 22ce46f25..8c2c96af2 100644
--- a/stm/main.c
+++ b/stm/main.c
@@ -706,7 +706,7 @@ mp_obj_t file_obj_read(mp_obj_t self_in, mp_obj_t arg) {
     UINT n_out;
     f_read(&self->fp, buf, n, &n_out);
     buf[n_out] = 0;
-    return mp_obj_new_str(qstr_from_str_take(buf));
+    return mp_obj_new_str(qstr_from_str_take(buf, n + 1));
 }
 
 mp_obj_t file_obj_write(mp_obj_t self_in, mp_obj_t arg) {
diff --git a/stm/pybwlan.c b/stm/pybwlan.c
index c078ecfe1..73aa8273f 100644
--- a/stm/pybwlan.c
+++ b/stm/pybwlan.c
@@ -191,7 +191,7 @@ mp_obj_t pyb_wlan_http_get(mp_obj_t host_name, mp_obj_t host_path) {
             vstr_add_strn(vstr, buf, ret);
         }
 
-        mp_ret = mp_obj_new_str(qstr_from_str_take(vstr_str(vstr)));
+        mp_ret = mp_obj_new_str(qstr_from_str_take(vstr->buf, vstr->alloc));
     }
 
     closesocket(sd);