Skip to content

fix: Address possible NULL binding compiler warning #1091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mykola-mokhnach merged 5 commits into from
Dec 18, 2025
Merged

fix: Address possible NULL binding compiler warning #1091

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb43a69
fix: Address possible NULL binding compiler warning
mykola-mokhnach Dec 18, 2025
657d203
use tabs
mykola-mokhnach Dec 18, 2025
d4409fd
spaces
mykola-mokhnach Dec 18, 2025
369e875
tune spaces
mykola-mokhnach Dec 18, 2025
2d58260
Align spaces
mykola-mokhnach Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 27 additions & 29 deletions WebDriverAgentLib/Vendor/CocoaAsyncSocket/GCDAsyncUdpSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2883,7 +2883,7 @@ - (BOOL)bindToPort:(uint16_t)port interface:(NSString *)interface error:(NSError

// Create the socket(s) if needed

if ((self->flags & kDidCreateSockets) == 0)
if ((self->flags & kDidCreateSockets) == 0)
{
if (![self createSocket4:useIPv4 socket6:useIPv6 error:&err])
{
Expand All @@ -2897,7 +2897,7 @@ - (BOOL)bindToPort:(uint16_t)port interface:(NSString *)interface error:(NSError

if (useIPv4)
{
int status = bind(self->socket4FD, (const struct sockaddr *)[interface4 bytes], (socklen_t)[interface4 length]);
int status = bind(self->socket4FD, (const struct sockaddr *)[interface4 bytes], (socklen_t)[interface4 length]);
if (status == -1)
{
[self closeSockets];
Expand All @@ -2911,7 +2911,7 @@ - (BOOL)bindToPort:(uint16_t)port interface:(NSString *)interface error:(NSError

if (useIPv6)
{
int status = bind(self->socket6FD, (const struct sockaddr *)[interface6 bytes], (socklen_t)[interface6 length]);
int status = bind(self->socket6FD, (const struct sockaddr *)[interface6 bytes], (socklen_t)[interface6 length]);
if (status == -1)
{
[self closeSockets];
Expand All @@ -2925,10 +2925,10 @@ - (BOOL)bindToPort:(uint16_t)port interface:(NSString *)interface error:(NSError

// Update flags

self->flags |= kDidBind;
self->flags |= kDidBind;

if (!useIPv4) self->flags |= kIPv4Deactivated;
if (!useIPv6) self->flags |= kIPv6Deactivated;
if (!useIPv4) self->flags |= kIPv4Deactivated;
if (!useIPv6) self->flags |= kIPv6Deactivated;

result = YES;

Expand Down Expand Up @@ -3003,7 +3003,7 @@ - (BOOL)bindToAddress:(NSData *)localAddr error:(NSError **)errPtr

// Create the socket(s) if needed

if ((self->flags & kDidCreateSockets) == 0)
if ((self->flags & kDidCreateSockets) == 0)
{
if (![self createSocket4:useIPv4 socket6:useIPv6 error:&err])
{
Expand All @@ -3013,30 +3013,28 @@ - (BOOL)bindToAddress:(NSData *)localAddr error:(NSError **)errPtr

// Bind the socket(s)

if (useIPv4)
if (useIPv4 || useIPv6)
{
NSData *addressData = useIPv4 ? localAddr4 : localAddr6;
int socketFD = useIPv4 ? self->socket4FD : self->socket6FD;
NSString *protocol = useIPv4 ? @"IPv4" : @"IPv6";

LogVerbose(@"Binding socket to address(%@:%hu)",
[[self class] hostFromAddress:localAddr4],
[[self class] portFromAddress:localAddr4]);
[[self class] hostFromAddress:addressData],
[[self class] portFromAddress:addressData]);

int status = bind(self->socket4FD, (const struct sockaddr *)[localAddr4 bytes], (socklen_t)[localAddr4 length]);
if (status == -1)
const struct sockaddr *addr = (const struct sockaddr *)[addressData bytes];
if (addr == NULL)
{
[self closeSockets];

NSString *reason = @"Error in bind() function";
err = [self errnoErrorWithReason:reason];
NSString *reason = [NSString stringWithFormat:@"Invalid address data for %@ bind", protocol];
err = [self badParamError:reason];

return_from_block;
}
}
else
{
LogVerbose(@"Binding socket to address(%@:%hu)",
[[self class] hostFromAddress:localAddr6],
[[self class] portFromAddress:localAddr6]);

int status = bind(self->socket6FD, (const struct sockaddr *)[localAddr6 bytes], (socklen_t)[localAddr6 length]);
int status = bind(socketFD, addr, (socklen_t)[addressData length]);
if (status == -1)
{
[self closeSockets];
Expand All @@ -3050,10 +3048,10 @@ - (BOOL)bindToAddress:(NSData *)localAddr error:(NSError **)errPtr

// Update flags

self->flags |= kDidBind;
self->flags |= kDidBind;

if (!useIPv4) self->flags |= kIPv4Deactivated;
if (!useIPv6) self->flags |= kIPv6Deactivated;
if (!useIPv4) self->flags |= kIPv4Deactivated;
if (!useIPv6) self->flags |= kIPv6Deactivated;

result = YES;

Expand Down Expand Up @@ -3140,7 +3138,7 @@ - (BOOL)connectToHost:(NSString *)host onPort:(uint16_t)port error:(NSError **)e

// Create the socket(s) if needed

if ((self->flags & kDidCreateSockets) == 0)
if ((self->flags & kDidCreateSockets) == 0)
{
if (![self createSockets:&err])
{
Expand Down Expand Up @@ -3173,9 +3171,9 @@ - (BOOL)connectToHost:(NSString *)host onPort:(uint16_t)port error:(NSError **)e

// Updates flags, add connect packet to send queue, and pump send queue

self->flags |= kConnecting;
self->flags |= kConnecting;

[self->sendQueue addObject:packet];
[self->sendQueue addObject:packet];
Copy link
Copy Markdown
Member

@KazuCocoa KazuCocoa Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe... these might need more spaces....? I guess this file has mixed with tabs/spaces...?

Copy link
Copy Markdown
Author

@mykola-mokhnach mykola-mokhnach Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes sense to completely reformat the whole file in Xcode, but not in the same PR

[self maybeDequeueSend];

result = YES;
Expand Down Expand Up @@ -3240,9 +3238,9 @@ - (BOOL)connectToAddress:(NSData *)remoteAddr error:(NSError **)errPtr

// Updates flags, add connect packet to send queue, and pump send queue

self->flags |= kConnecting;
self->flags |= kConnecting;

[self->sendQueue addObject:packet];
[self->sendQueue addObject:packet];
[self maybeDequeueSend];

result = YES;
Expand Down
Loading