[openwrt/openwrt] ucode: fix an issue in exception handling improvement for ubus/uloop

LEDE Commits lede-commits at lists.infradead.org
Sun Jul 6 13:05:37 PDT 2025


nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/77b9393d2f3609956a54a6e7d38bda8ddba6046a

commit 77b9393d2f3609956a54a6e7d38bda8ddba6046a
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sun Jul 6 22:05:03 2025 +0200

    ucode: fix an issue in exception handling improvement for ubus/uloop
    
    Remove an uloop_end() call from a user cb that wasn't there before
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../patches/102-ubus-add-exception_handler_set-function.patch    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package/utils/ucode/patches/102-ubus-add-exception_handler_set-function.patch b/package/utils/ucode/patches/102-ubus-add-exception_handler_set-function.patch
index 3490782495..6b6508d06f 100644
--- a/package/utils/ucode/patches/102-ubus-add-exception_handler_set-function.patch
+++ b/package/utils/ucode/patches/102-ubus-add-exception_handler_set-function.patch
@@ -51,15 +51,6 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
  uc_ubus_call_user_cb(uc_ubus_deferred_t *defer, int ret, uc_value_t *reply)
  {
  	uc_value_t *this = ucv_get(defer->res);
-@@ -587,7 +621,7 @@ uc_ubus_call_user_cb(uc_ubus_deferred_t
- 		uc_vm_stack_push(vm, ucv_int64_new(ret));
- 		uc_vm_stack_push(vm, ucv_get(reply));
- 
--		if (uc_vm_call(vm, true, 2) == EXCEPTION_NONE)
-+		if (uc_ubus_vm_call(vm, true, 2))
- 			ucv_put(uc_vm_stack_pop(vm));
- 	}
- 
 @@ -623,10 +657,8 @@ uc_ubus_call_data_user_cb(struct ubus_re
  		uc_vm_stack_push(vm, ucv_get(func));
  		uc_vm_stack_push(vm, ucv_get(reply));




More information about the lede-commits mailing list