Skip to content

fix: safer callback handling and argument validation #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wemeetagain merged 2 commits into from
Mar 19, 2026
Merged

fix: safer callback handling and argument validation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a5e09e
fix: safer callback handling and argument validation
nazarhussain Mar 17, 2026
e7d065e
revert change to module.zig
nazarhussain Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/callback.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ pub fn wrapCallback(
if (error_info_status == .ok) {
e.throwError(@errorName(err), "NapiError") catch {};
} else {
e.throwError(
@tagName(error_info_status),
std.mem.span(error_info.error_message),
) catch {};
const message: [:0]const u8 = "Native callback failed";
e.throwError(@tagName(error_info_status), message) catch {};
}
} else {
e.throwError(@errorName(err), @errorName(err)) catch {};
Expand Down
9 changes: 5 additions & 4 deletions src/callback_info.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const std = @import("std");
const c = @import("c.zig");
const status = @import("status.zig");
const NapiError = @import("status.zig").NapiError;
Expand All @@ -17,10 +18,10 @@ pub fn CallbackInfo(comptime argc_cap: usize) type {
pub fn init(env: c.napi_env, cb_info: c.napi_callback_info) NapiError!Self {
var info = Self{
.env = env,
.args = undefined,
.this_arg = undefined,
.argc = undefined,
.data = undefined,
.args = std.mem.zeroes([argc_cap]c.napi_value),
.this_arg = std.mem.zeroes(c.napi_value),
.argc = 0,
.data = null,
};

var initial_argc = argc_cap;
Expand Down
22 changes: 18 additions & 4 deletions src/create_callback.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,28 @@ pub fn createCallback(
var cb_arg_i: usize = 0;
inline for (0..fn_info.params.len) |i| {
const arg_hint = comptime getArgsHint(options, i);
const param_type = fn_info.params[i].type.?;

const is_env_arg = arg_hint == .env or (arg_hint == .auto and param_type == Env);
const is_value_arg = arg_hint == .value or (arg_hint == .auto and param_type == Value);

if (arg_hint == .data) {
args[i] = @alignCast(@ptrCast(info.data));
} else if (arg_hint == .env) {
} else if (is_env_arg) {
args[i] = env;
} else if (arg_hint == .value) {
args[i] = info.arg(cb_arg_i);
} else if (is_value_arg) {
const value_arg = info.getArg(cb_arg_i) orelse {
try env.throwError("ERR_INVALID_ARG_COUNT", "Invalid callback argument count");
return error.PendingException;
};
args[i] = value_arg;
cb_arg_i += 1;
} else {
args[i] = try fromValue(fn_info.params[i].type.?, info.arg(cb_arg_i), arg_hint);
const value_arg = info.getArg(cb_arg_i) orelse {
try env.throwError("ERR_INVALID_ARG_COUNT", "Invalid callback argument count");
return error.PendingException;
};
args[i] = try fromValue(param_type, value_arg, arg_hint);
cb_arg_i += 1;
}
}
Expand Down Expand Up @@ -73,6 +86,7 @@ pub const ArgHint = enum {
pub const ReturnsHint = enum {
auto,
buffer,
external_buffer,
string,

/// napi.Value
Expand Down