Merge pull request #102128 from Faless/fix/ws_buffering_again

Repiteo · Repiteo · commit 4a7ce6070d38 · 2025-01-31T09:15:50.000-06:00
[WS] Fix wslay multi-frame message parsing (again)
diff --git a/modules/websocket/wsl_peer.cpp b/modules/websocket/wsl_peer.cpp
@@ -598,7 +598,6 @@ void WSLPeer::_wsl_recv_start_callback(wslay_event_context_ptr ctx, const struct
 		// Get ready to process a data package.
 		PendingMessage &pm = peer->pending_message;
 		pm.opcode = op;
-		pm.payload_size = arg->payload_length;
 	}
 }
 
@@ -608,6 +607,7 @@ void WSLPeer::_wsl_frame_recv_chunk_callback(wslay_event_context_ptr ctx, const
 	if (pm.opcode != 0) {
 		// Only write the payload.
 		peer->in_buffer.write_packet(arg->data, arg->data_length, nullptr);
+		pm.payload_size += arg->data_length;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,6 @@ void WSLPeer::_wsl_recv_start_callback(wslay_event_context_ptr ctx, const struct`
`598`	`598`	`// Get ready to process a data package.`
`599`	`599`	`PendingMessage &pm = peer->pending_message;`
`600`	`600`	`pm.opcode = op;`
`601`		`- pm.payload_size = arg->payload_length;`
`602`	`601`	`}`
`603`	`602`	`}`
`604`	`603`
`@@ -608,6 +607,7 @@ void WSLPeer::_wsl_frame_recv_chunk_callback(wslay_event_context_ptr ctx, const`
`608`	`607`	`if (pm.opcode != 0) {`
`609`	`608`	`// Only write the payload.`
`610`	`609`	`peer->in_buffer.write_packet(arg->data, arg->data_length, nullptr);`
	`610`	`+ pm.payload_size += arg->data_length;`
`611`	`611`	`}`
`612`	`612`	`}`
`613`	`613`