From 04d97b6c52313376182232c238ad773dc93605ae Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 7 Nov 2024 11:34:56 +0100 Subject: [PATCH] Fix "arithmetic on a pointer to void" warning. Error appears when rolling Chromium in WebRTC: https://ci.chromium.org/ui/p/webrtc/builders/try/mac_rel/76983/overview Change-Id: Ibe9b15680efb00cac2333639a12c71cb76f6e71b Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367781 Commit-Queue: Harald Alvestrand Reviewed-by: Harald Alvestrand Auto-Submit: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#43370} --- .../third_party/SocketRocket/SRWebSocket.m | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m b/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m index 7c1dd98a81..68f3e93f7f 100644 --- a/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m +++ b/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m @@ -1080,12 +1080,19 @@ static const uint8_t SRPayloadLenMask = 0x7F; NSUInteger dataLength = _outputBuffer.length; if (dataLength - _outputBufferOffset > 0 && _outputStream.hasSpaceAvailable) { - NSInteger bytesWritten = [_outputStream write:_outputBuffer.bytes + _outputBufferOffset maxLength:dataLength - _outputBufferOffset]; - if (bytesWritten == -1) { - [self _failWithError:[NSError errorWithDomain:SRWebSocketErrorDomain code:2145 userInfo:[NSDictionary dictionaryWithObject:@"Error writing to stream" forKey:NSLocalizedDescriptionKey]]]; - return; - } - + NSInteger bytesWritten = + [_outputStream write:(const unsigned char *)_outputBuffer.bytes + _outputBufferOffset + maxLength:dataLength - _outputBufferOffset]; + if (bytesWritten == -1) { + [self _failWithError: + [NSError errorWithDomain:SRWebSocketErrorDomain + code:2145 + userInfo:[NSDictionary + dictionaryWithObject:@"Error writing to stream" + forKey:NSLocalizedDescriptionKey]]]; + return; + } + _outputBufferOffset += bytesWritten; if (_outputBufferOffset > 4096 && _outputBufferOffset > (_outputBuffer.length >> 1)) {