From 0bee37a5e24048cbf92c1b56efd0c65deaea1418 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Mon, 11 Dec 2023 12:22:54 +0530 Subject: [PATCH] fix(ext/websocket): don't panic on bad resource id (#21431) https://github.com/denoland/deno/issues/21379 --- ext/websocket/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs index c2599f6f61..c8e0921c9f 100644 --- a/ext/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -719,9 +719,9 @@ pub async fn op_ws_close( pub fn op_ws_get_buffer( state: &mut OpState, #[smi] rid: ResourceId, -) -> ToJsBuffer { - let resource = state.resource_table.get::(rid).unwrap(); - resource.buffer.take().unwrap().into() +) -> Result { + let resource = state.resource_table.get::(rid)?; + Ok(resource.buffer.take().unwrap().into()) } #[op2] @@ -729,9 +729,9 @@ pub fn op_ws_get_buffer( pub fn op_ws_get_buffer_as_string( state: &mut OpState, #[smi] rid: ResourceId, -) -> String { - let resource = state.resource_table.get::(rid).unwrap(); - resource.string.take().unwrap() +) -> Result { + let resource = state.resource_table.get::(rid)?; + Ok(resource.string.take().unwrap()) } #[op2]