[openwrt/openwrt] ucode-mod-uline: re-introduce polling loop to fix prompt after line end
LEDE Commits
lede-commits at lists.infradead.org
Wed May 7 08:26:23 PDT 2025
nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0b4ddeed5e27c53e08c797300642c2751e76f300
commit 0b4ddeed5e27c53e08c797300642c2751e76f300
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed May 7 17:21:38 2025 +0200
ucode-mod-uline: re-introduce polling loop to fix prompt after line end
Introduce a check for the resource data in order to avoid segfaulting
on exit
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
package/utils/ucode-mod-uline/src/ucode.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/package/utils/ucode-mod-uline/src/ucode.c b/package/utils/ucode-mod-uline/src/ucode.c
index 7d7753a6d8..bf53a636ed 100644
--- a/package/utils/ucode-mod-uline/src/ucode.c
+++ b/package/utils/ucode-mod-uline/src/ucode.c
@@ -368,21 +368,25 @@ uc_uline_cb_event(struct uline_state *s, enum uline_event ev)
static void uc_uline_poll_cb(struct uloop_fd *fd, unsigned int events)
{
struct uc_uline_state *us = container_of(fd, struct uc_uline_state, fd);
+ uc_value_t *res = ucv_get(us->res);
uc_value_t *val;
- uline_poll(&us->s);
+ while (!uloop_cancelled && ucv_resource_data(res, NULL) && us->poll_cb) {
+ uline_poll(&us->s);
- val = us->line;
- if (!val)
- return;
+ val = us->line;
+ if (!val)
+ break;
- us->line = NULL;
- if (!ucv_is_callable(us->poll_cb))
- return;
+ us->line = NULL;
+ if (!ucv_is_callable(us->poll_cb))
+ break;
- uc_vm_stack_push(us->vm, ucv_get(us->res));
- uc_vm_stack_push(us->vm, ucv_get(us->poll_cb));
- cb_call(us, 1, val);
+ uc_vm_stack_push(us->vm, ucv_get(res));
+ uc_vm_stack_push(us->vm, ucv_get(us->poll_cb));
+ cb_call(us, 1, val);
+ }
+ ucv_put(res);
}
static bool
More information about the lede-commits
mailing list