ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure the reference is not nil to packet flow. Thanks go out to "The Eskimo".

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts
2018-08-14 21:40:20 +02:00
parent fc72697d82
commit 335907309c
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuardNetworkExtension/WireGuardGoWrapper.m
+6
View File
@@ -83,12 +83,14 @@ static void do_log(int level, const char *tag, const char *msg);
os_log_debug([WireGuardGoWrapper log], "readPackets - read call - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
[self.packetFlow readPacketsWithCompletionHandler:^(NSArray<NSData *> * _Nonnull packets, NSArray<NSNumber *> * _Nonnull protocols) {
[self.condition lock];
@synchronized(self.packets) {
[self.packets addObjectsFromArray:packets];
[self.protocols addObjectsFromArray:protocols];
}
os_log_debug([WireGuardGoWrapper log], "readPackets - signal - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
[self.condition signal];
[self.condition unlock];
[self readPackets];
}];
});
@@ -126,6 +128,7 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
NSData * __block packet = nil;
// NSNumber *protocol = nil;
dispatch_sync(wrapper.dispatchQueue, ^{
[wrapper.condition lock];
@synchronized(wrapper.packets) {
if (wrapper.packets.count == 0) {
os_log_debug([WireGuardGoWrapper log], "do_read - no packet - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
@@ -143,7 +146,10 @@ static ssize_t do_read(const void *ctx, const unsigned char *buf, size_t len)
if (packet == nil) {
os_log_debug([WireGuardGoWrapper log], "do_read - wait - on thread \"%{public}@\" - %d", NSThread.currentThread.name, (int)NSThread.currentThread);
[wrapper.condition wait];
[wrapper.condition unlock];
return 0;
} else {
[wrapper.condition unlock];
}
NSUInteger packetLength = [packet length];