foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

cli: don't panic on Deno.close invalid argument (#5320)

Browse source
This commit is contained in:
Kevin (Kun) "Kassimo" Qian 2020-05-14 03:59:56 -07:00 committed by GitHub
parent 21a4e9cc58
commit 7de86ab605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/js/tests/resources_test.ts
View file

@ -1,6 +1,16 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import { unitTest, assertEquals, assert } from "./test_util.ts"; import { unitTest, assertEquals, assert } from "./test_util.ts";
unitTest(function resourcesCloseBadArgs(): void {
let err;
try {
Deno.close((null as unknown) as number);
} catch (e) {
err = e;
}
assert(err instanceof Deno.errors.InvalidData);
});
unitTest(function resourcesStdio(): void { unitTest(function resourcesStdio(): void {
const res = Deno.resources(); const res = Deno.resources();

2
cli/ops/resources.rs
View file

@ -31,7 +31,7 @@ fn op_close(
struct CloseArgs { struct CloseArgs {
rid: i32, rid: i32,
} }
let args: CloseArgs = serde_json::from_value(args).unwrap(); let args: CloseArgs = serde_json::from_value(args)?;
let mut resource_table = isolate.resource_table.borrow_mut(); let mut resource_table = isolate.resource_table.borrow_mut();
resource_table resource_table
.close(args.rid as u32) .close(args.rid as u32)