fix(ext/websocket): don't panic on bad resource id (#21431)

#21379
denoland · Dec 11, 2023 · 0bee37a · 0bee37a
1 parent 5e24e28
commit 0bee37a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs
@@ -719,19 +719,19 @@ 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::<ServerWebSocket>(rid).unwrap();
-  resource.buffer.take().unwrap().into()
+) -> Result<ToJsBuffer, AnyError> {
+  let resource = state.resource_table.get::<ServerWebSocket>(rid)?;
+  Ok(resource.buffer.take().unwrap().into())
 }
 
 #[op2]
 #[string]
 pub fn op_ws_get_buffer_as_string(
   state: &mut OpState,
   #[smi] rid: ResourceId,
-) -> String {
-  let resource = state.resource_table.get::<ServerWebSocket>(rid).unwrap();
-  resource.string.take().unwrap()
+) -> Result<String, AnyError> {
+  let resource = state.resource_table.get::<ServerWebSocket>(rid)?;
+  Ok(resource.string.take().unwrap())
 }
 
 #[op2]