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

Merge pull request #7694 from DavePutz/issue_7054 

Fix for issue #7054 by avoiding recursive calls to websocket_background.
This commit is contained in:
Dan Halbert 2023-03-09 11:02:15 -05:00 committed by GitHub
parent 23818e9452 59f56a438a
commit 21305e3e1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
supervisor/shared/web_workflow/websocket.c
View File

@ -52,6 +52,8 @@ typedef struct {
// interrupt character. // interrupt character.
STATIC ringbuf_t _incoming_ringbuf; STATIC ringbuf_t _incoming_ringbuf;
STATIC uint8_t _buf[16]; STATIC uint8_t _buf[16];
// make sure background is not called recursively
STATIC bool in_web_background = false;
static _websocket cp_serial; static _websocket cp_serial;
@ -244,6 +246,10 @@ void websocket_background(void) {
if (!websocket_connected()) { if (!websocket_connected()) {
return; return;
} }
if (in_web_background) {
return;
}
in_web_background = true;
uint8_t c; uint8_t c;
while (ringbuf_num_empty(&_incoming_ringbuf) > 0 && while (ringbuf_num_empty(&_incoming_ringbuf) > 0 &&
_read_next_payload_byte(&c)) { _read_next_payload_byte(&c)) {
@ -253,4 +259,5 @@ void websocket_background(void) {
} }
ringbuf_put(&_incoming_ringbuf, c); ringbuf_put(&_incoming_ringbuf, c);
} }
in_web_background = false;
} }