From e2fdf0fb0453092c2c456cad7a5809377f7fef37 Mon Sep 17 00:00:00 2001 From: Vitali Zaidman Date: Mon, 2 Mar 2026 23:26:02 -0800 Subject: [PATCH] Add headers validation check to prevent crash (#55749) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55749 Add defensive checks when processing custom headers to ensure: 1. Header keys are valid NSString instances before using them 2. Header values are successfully converted before adding to the request This prevents potential crashes when invalid header data (non-string keys or values that fail conversion) is passed from JavaScript to the WebSocket module. Changelog: [Internal] Reviewed By: javache Differential Revision: D94375533 fbshipit-source-id: 8af25eb2e2d5426e2bae5503a88cc5bc160b84cc --- .../React/CoreModules/RCTWebSocketModule.mm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/react-native/React/CoreModules/RCTWebSocketModule.mm b/packages/react-native/React/CoreModules/RCTWebSocketModule.mm index d7b51fe3078..27f53f88dd8 100644 --- a/packages/react-native/React/CoreModules/RCTWebSocketModule.mm +++ b/packages/react-native/React/CoreModules/RCTWebSocketModule.mm @@ -94,8 +94,23 @@ RCT_EXPORT_METHOD( // Load supplied headers if ([options.headers() isKindOfClass:NSDictionary.class]) { NSDictionary *headers = (NSDictionary *)options.headers(); - [headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) { - [request addValue:[RCTConvert NSString:value] forHTTPHeaderField:key]; + [headers enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) { + NSString *headerKey = [RCTConvert NSString:key]; + NSString *headerValue = [RCTConvert NSString:value]; + + if (headerKey == nil || headerValue == nil) { + RCTLogError( + @"RCTWebSocketModule: Invalid header key and/or value types. " + "Expected NSString for both, got key of type %@ and value of type %@.", + NSStringFromClass([key class]), + NSStringFromClass([value class])); + } + + if (headerKey == nil) { + return; + } + + [request addValue:headerValue == nil ? @"" : headerValue forHTTPHeaderField:headerKey]; }]; }