Fixed analyzer warning in AsyncUdpSocket.m

karnevil9 · karnevil9 · commit d8c3fe2e1f8e · 2013-10-31T13:59:37.000-07:00
Fixed analyzer's 'possible leak' warning in -[AsyncUdpSocket
doReceive:] by using an NSData local variable instead of
theCurrentReceive-&gt;buffer to do the test of whether'buf' needs to be
freed.
diff --git a/RunLoop/AsyncUdpSocket.m b/RunLoop/AsyncUdpSocket.m
@@ -2076,6 +2076,7 @@ - (void)doReceive:(CFSocketRef)theSocket
 		
 			if([self hasBytesAvailable:theSocket])
 			{
+                NSData* bufferData = nil;
 				ssize_t result;
 				CFSocketNativeHandle theNativeSocket = CFSocketGetNative(theSocket);
 				
@@ -2109,9 +2110,10 @@ - (void)doReceive:(CFSocketRef)theSocket
 							{
 								buf = realloc(buf, result);
 							}
-							theCurrentReceive->buffer = [[NSData alloc] initWithBytesNoCopy:buf
+                            bufferData = [[NSData alloc] initWithBytesNoCopy:buf
 																					 length:result
 																			   freeWhenDone:YES];
+							theCurrentReceive->buffer = bufferData;
 							theCurrentReceive->host = host;
 							theCurrentReceive->port = port;
 						}
@@ -2143,9 +2145,10 @@ - (void)doReceive:(CFSocketRef)theSocket
 							{
 								buf = realloc(buf, result);
 							}
-							theCurrentReceive->buffer = [[NSData alloc] initWithBytesNoCopy:buf
+                            bufferData = [[NSData alloc] initWithBytesNoCopy:buf
 																					 length:result
 																			   freeWhenDone:YES];
+							theCurrentReceive->buffer = bufferData;
 							theCurrentReceive->host = host;
 							theCurrentReceive->port = port;
 						}
@@ -2155,8 +2158,8 @@ - (void)doReceive:(CFSocketRef)theSocket
 				}
 				
 				// Check to see if we need to free our alloc'd buffer
-				// If the buffer is non-nil, this means it has taken ownership of the buffer
-				if(theCurrentReceive->buffer == nil)
+				// If bufferData is non-nil, it has taken ownership of the buffer
+				if(bufferData == nil)
 				{
 					free(buf);
 				}

Original file line number	Diff line number	Diff line change
`@@ -2076,6 +2076,7 @@ - (void)doReceive:(CFSocketRef)theSocket`
`2076`	`2076`
`2077`	`2077`	`if([self hasBytesAvailable:theSocket])`
`2078`	`2078`	`{`
	`2079`	`+ NSData* bufferData = nil;`
`2079`	`2080`	`ssize_t result;`
`2080`	`2081`	`CFSocketNativeHandle theNativeSocket = CFSocketGetNative(theSocket);`
`2081`	`2082`
`@@ -2109,9 +2110,10 @@ - (void)doReceive:(CFSocketRef)theSocket`
`2109`	`2110`	`{`
`2110`	`2111`	`buf = realloc(buf, result);`
`2111`	`2112`	`}`
`2112`		`- theCurrentReceive->buffer = [[NSData alloc] initWithBytesNoCopy:buf`
	`2113`	`+ bufferData = [[NSData alloc] initWithBytesNoCopy:buf`
`2113`	`2114`	`length:result`
`2114`	`2115`	`freeWhenDone:YES];`
	`2116`	`+ theCurrentReceive->buffer = bufferData;`
`2115`	`2117`	`theCurrentReceive->host = host;`
`2116`	`2118`	`theCurrentReceive->port = port;`
`2117`	`2119`	`}`
`@@ -2143,9 +2145,10 @@ - (void)doReceive:(CFSocketRef)theSocket`
`2143`	`2145`	`{`
`2144`	`2146`	`buf = realloc(buf, result);`
`2145`	`2147`	`}`
`2146`		`- theCurrentReceive->buffer = [[NSData alloc] initWithBytesNoCopy:buf`
	`2148`	`+ bufferData = [[NSData alloc] initWithBytesNoCopy:buf`
`2147`	`2149`	`length:result`
`2148`	`2150`	`freeWhenDone:YES];`
	`2151`	`+ theCurrentReceive->buffer = bufferData;`
`2149`	`2152`	`theCurrentReceive->host = host;`
`2150`	`2153`	`theCurrentReceive->port = port;`
`2151`	`2154`	`}`
`@@ -2155,8 +2158,8 @@ - (void)doReceive:(CFSocketRef)theSocket`
`2155`	`2158`	`}`
`2156`	`2159`
`2157`	`2160`	`// Check to see if we need to free our alloc'd buffer`
`2158`		`- // If the buffer is non-nil, this means it has taken ownership of the buffer`
`2159`		`- if(theCurrentReceive->buffer == nil)`
	`2161`	`+ // If bufferData is non-nil, it has taken ownership of the buffer`
	`2162`	`+ if(bufferData == nil)`
`2160`	`2163`	`{`
`2161`	`2164`	`free(buf);`
`2162`	`2165`	`}`