esp8266/esp_mphal: mp_uos_dupterm_deactivate() may raise exception.

pfalcon · pfalcon · commit 2b05b60bbc7e · 2016-05-24T15:04:59.000+03:00
So, keep call to it protected via NLR still.
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c
@@ -171,11 +171,12 @@ static int call_dupterm_read(void) {
         }
         mp_buffer_info_t bufinfo;
         mp_get_buffer_raise(res, &bufinfo, MP_BUFFER_READ);
-        nlr_pop();
         if (bufinfo.len == 0) {
             mp_uos_deactivate("dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
+            nlr_pop();
             return -1;
         }
+        nlr_pop();
         if (*(byte*)bufinfo.buf == interrupt_char) {
             mp_keyboard_interrupt();
             return -2;

Original file line number	Diff line number	Diff line change
`@@ -171,11 +171,12 @@ static int call_dupterm_read(void) {`
`171`	`171`	`}`
`172`	`172`	`mp_buffer_info_t bufinfo;`
`173`	`173`	`mp_get_buffer_raise(res, &bufinfo, MP_BUFFER_READ);`
`174`		`- nlr_pop();`
`175`	`174`	`if (bufinfo.len == 0) {`
`176`	`175`	`mp_uos_deactivate("dupterm: EOF received, deactivating\n", MP_OBJ_NULL);`
	`176`	`+ nlr_pop();`
`177`	`177`	`return -1;`
`178`	`178`	`}`
	`179`	`+ nlr_pop();`
`179`	`180`	`if ((byte)bufinfo.buf == interrupt_char) {`
`180`	`181`	`mp_keyboard_interrupt();`
`181`	`182`	`return -2;`