]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
ucode: fix an issue in exception handling improvement for ubus/uloop
authorFelix Fietkau <nbd@nbd.name>
Sun, 6 Jul 2025 20:05:03 +0000 (22:05 +0200)
committerFelix Fietkau <nbd@nbd.name>
Sun, 6 Jul 2025 20:05:30 +0000 (22:05 +0200)
Remove an uloop_end() call from a user cb that wasn't there before

Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/utils/ucode/patches/102-ubus-add-exception_handler_set-function.patch

index 3490782495385ef5dac4bed0f70f3342093ce812..6b6508d06fc2e748125c64d2a52ef5a02dfb65e8 100644 (file)
@@ -51,15 +51,6 @@ Signed-off-by: Felix Fietkau <nbd@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));