Fixing crash and memory leak in GCDAsyncUdpSocket.

robbiehanson · robbiehanson · commit 736c22c9391e · 2011-12-20T01:59:49.000-08:00
diff --git a/GCD/GCDAsyncUdpSocket.m b/GCD/GCDAsyncUdpSocket.m
@@ -3997,7 +3997,7 @@ - (void)doReceive
 				socket4FDBytesAvailable -= result;
 			
 			if (result != bufSize) {
-				realloc(buf, result);
+				buf = realloc(buf, result);
 			}
 			
 			data = [NSData dataWithBytesNoCopy:buf length:result freeWhenDone:YES];
@@ -4006,6 +4006,7 @@ - (void)doReceive
 		else
 		{
 			LogVerbose(@"recvfrom(socket4FD) = %@", [self errnoError]);
+			free(buf);
 		}
 	}
 	else
@@ -4030,7 +4031,7 @@ - (void)doReceive
 				socket6FDBytesAvailable -= result;
 			
 			if (result != bufSize) {
-				realloc(buf, result);
+				buf = realloc(buf, result);
 			}
 		
 			data = [NSData dataWithBytesNoCopy:buf length:result freeWhenDone:YES];
@@ -4039,6 +4040,7 @@ - (void)doReceive
 		else
 		{
 			LogVerbose(@"recvfrom(socket6FD) = %@", [self errnoError]);
+			free(buf);
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -3997,7 +3997,7 @@ - (void)doReceive`
`3997`	`3997`	`socket4FDBytesAvailable -= result;`
`3998`	`3998`
`3999`	`3999`	`if (result != bufSize) {`
`4000`		`- realloc(buf, result);`
	`4000`	`+ buf = realloc(buf, result);`
`4001`	`4001`	`}`
`4002`	`4002`
`4003`	`4003`	`data = [NSData dataWithBytesNoCopy:buf length:result freeWhenDone:YES];`
`@@ -4006,6 +4006,7 @@ - (void)doReceive`
`4006`	`4006`	`else`
`4007`	`4007`	`{`
`4008`	`4008`	`LogVerbose(@"recvfrom(socket4FD) = %@", [self errnoError]);`
	`4009`	`+ free(buf);`
`4009`	`4010`	`}`
`4010`	`4011`	`}`
`4011`	`4012`	`else`
`@@ -4030,7 +4031,7 @@ - (void)doReceive`
`4030`	`4031`	`socket6FDBytesAvailable -= result;`
`4031`	`4032`
`4032`	`4033`	`if (result != bufSize) {`
`4033`		`- realloc(buf, result);`
	`4034`	`+ buf = realloc(buf, result);`
`4034`	`4035`	`}`
`4035`	`4036`
`4036`	`4037`	`data = [NSData dataWithBytesNoCopy:buf length:result freeWhenDone:YES];`
`@@ -4039,6 +4040,7 @@ - (void)doReceive`
`4039`	`4040`	`else`
`4040`	`4041`	`{`
`4041`	`4042`	`LogVerbose(@"recvfrom(socket6FD) = %@", [self errnoError]);`
	`4043`	`+ free(buf);`
`4042`	`4044`	`}`
`4043`	`4045`	`}`
`4044`	`4046`