djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp8266/esp_mphal: Fix NLR buffer leak in call_dupterm_read().

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-05-24 01:30:28 +03:00
parent bc2ba6b2e3
commit 116eeee6db
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
esp8266/esp_mphal.c
View File

@ -166,15 +166,16 @@ static int call_dupterm_read(void) {
read_m[2] = MP_OBJ_NEW_SMALL_INT(1); read_m[2] = MP_OBJ_NEW_SMALL_INT(1);
mp_obj_t res = mp_call_method_n_kw(1, 0, read_m); mp_obj_t res = mp_call_method_n_kw(1, 0, read_m);
if (res == mp_const_none) { if (res == mp_const_none) {
nlr_pop();
return -2; return -2;
} }
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;
mp_get_buffer_raise(res, &bufinfo, MP_BUFFER_READ); mp_get_buffer_raise(res, &bufinfo, MP_BUFFER_READ);
nlr_pop();
if (bufinfo.len == 0) { if (bufinfo.len == 0) {
mp_uos_deactivate("dupterm: EOF received, deactivating\n", MP_OBJ_NULL); mp_uos_deactivate("dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
return -1; return -1;
} }
nlr_pop();
return *(byte*)bufinfo.buf; return *(byte*)bufinfo.buf;
} else { } else {
mp_uos_deactivate("dupterm: Exception in read() method, deactivating: ", nlr.ret_val); mp_uos_deactivate("dupterm: Exception in read() method, deactivating: ", nlr.ret_val);