diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2023-02-17 22:03:22 -0800 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2023-02-17 22:03:22 -0800 |
| commit | 7416672e93c196bac9f7f2658a5ae987dc1f915b (patch) | |
| tree | 27c89944f775935b87053ceb444c926cd5d7d2fd | |
| parent | fa10631c2f89b68545095acbe4fb9c82573e75f6 (diff) | |
| download | bun-7416672e93c196bac9f7f2658a5ae987dc1f915b.tar.gz bun-7416672e93c196bac9f7f2658a5ae987dc1f915b.tar.zst bun-7416672e93c196bac9f7f2658a5ae987dc1f915b.zip | |
Fix edgecase in some arg parsing in `fs` module
| -rw-r--r-- | src/bun.js/node/node_fs.zig | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index 983874ea6..e068349a8 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -1026,15 +1026,17 @@ const Arguments = struct { arguments.eat(); if (val.isObject()) { - if (val.getIfPropertyExists(ctx.ptr(), "flags")) |flags_| { - flags = FileSystemFlags.fromJS(ctx, flags_, flags, exception) orelse flags; + if (val.getTruthy(ctx.ptr(), "flags")) |flags_| { + flags = FileSystemFlags.fromJS(ctx, flags_, exception) orelse flags; } - if (val.getIfPropertyExists(ctx.ptr(), "mode")) |mode_| { + if (val.getTruthy(ctx.ptr(), "mode")) |mode_| { mode = JSC.Node.modeFromJS(ctx, mode_, exception) orelse mode; } } else if (!val.isEmpty()) { - flags = FileSystemFlags.fromJS(ctx, val, flags, exception) orelse flags; + if (!val.isUndefinedOrNull()) + // error is handled below + flags = FileSystemFlags.fromJS(ctx, val, exception) orelse flags; if (arguments.nextEat()) |next| { mode = JSC.Node.modeFromJS(ctx, next, exception) orelse mode; @@ -1507,8 +1509,8 @@ const Arguments = struct { } } - if (arg.getIfPropertyExists(ctx.ptr(), "flag")) |flag_| { - flag = FileSystemFlags.fromJS(ctx, flag_, flag, exception) orelse { + if (arg.getTruthy(ctx.ptr(), "flag")) |flag_| { + flag = FileSystemFlags.fromJS(ctx, flag_, exception) orelse { if (exception.* == null) { JSC.throwInvalidArguments( "Invalid flag", @@ -1598,24 +1600,22 @@ const Arguments = struct { return null; }; } else if (arg.isObject()) { - if (arg.getIfPropertyExists(ctx.ptr(), "encoding")) |encoding_| { - if (!encoding_.isUndefinedOrNull()) { - encoding = Encoding.fromStringValue(encoding_, ctx.ptr()) orelse { - if (exception.* == null) { - JSC.throwInvalidArguments( - "Invalid encoding", - .{}, - ctx, - exception, - ); - } - return null; - }; - } + if (arg.getTruthy(ctx.ptr(), "encoding")) |encoding_| { + encoding = Encoding.fromStringValue(encoding_, ctx.ptr()) orelse { + if (exception.* == null) { + JSC.throwInvalidArguments( + "Invalid encoding", + .{}, + ctx, + exception, + ); + } + return null; + }; } - if (arg.getIfPropertyExists(ctx.ptr(), "flag")) |flag_| { - flag = FileSystemFlags.fromJS(ctx, flag_, flag, exception) orelse { + if (arg.getTruthy(ctx.ptr(), "flag")) |flag_| { + flag = FileSystemFlags.fromJS(ctx, flag_, exception) orelse { if (exception.* == null) { JSC.throwInvalidArguments( "Invalid flag", @@ -1628,7 +1628,7 @@ const Arguments = struct { }; } - if (arg.getIfPropertyExists(ctx.ptr(), "mode")) |mode_| { + if (arg.getTruthy(ctx.ptr(), "mode")) |mode_| { mode = JSC.Node.modeFromJS(ctx, mode_, exception) orelse { if (exception.* == null) { JSC.throwInvalidArguments( @@ -1785,7 +1785,7 @@ const Arguments = struct { if (arguments.next()) |arg| { arguments.eat(); if (arg.isString()) { - mode = FileSystemFlags.fromJS(ctx, arg, mode, exception) orelse { + mode = FileSystemFlags.fromJS(ctx, arg, exception) orelse { if (exception.* == null) { JSC.throwInvalidArguments( "Invalid mode", @@ -1879,9 +1879,9 @@ const Arguments = struct { }; } - if (arg.getIfPropertyExists(ctx.ptr(), "flags")) |flags| { + if (arg.getTruthy(ctx.ptr(), "flags")) |flags| { stream.flags = FileSystemFlags.fromJS(ctx, flags, exception) orelse { - if (exception.* != null) { + if (exception.* == null) { JSC.throwInvalidArguments( "Invalid flags", .{}, @@ -2013,9 +2013,9 @@ const Arguments = struct { }; } - if (arg.getIfPropertyExists(ctx.ptr(), "flags")) |flags| { + if (arg.getTruthy(ctx.ptr(), "flags")) |flags| { stream.flags = FileSystemFlags.fromJS(ctx, flags, exception) orelse { - if (exception.* != null) { + if (exception.* == null) { JSC.throwInvalidArguments( "Invalid flags", .{}, |