Bug fix for #3410 & #3403 by Simon Fraser, reviewed by Gordon Sheridan. Stop leaking UPPs everytime we do a file read.

1 files changed, 10 insertions, 2 deletions

diff --git a/pr/src/md/mac/macio.c b/pr/src/md/mac/macio.c
index ab1e8697..e7062a77 100644
--- a/pr/src/md/mac/macio.c
+++ b/pr/src/md/mac/macio.c
@@ -243,11 +243,19 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op)
 		goto ErrorExit;
 	}
 #endif
-	{		
+	{
+		static IOCompletionUPP	sCompletionUPP = NULL;
+		
+		/* allocate the callback Universal Procedure Pointer (UPP). This actually allocates
+		   a 32 byte Ptr in the heap, so only do this once
+		*/
+		if (!sCompletionUPP)
+			sCompletionUPP = NewIOCompletionProc((ProcPtr)&AsyncIOCompletion);
+			
 		/* grab the thread so we know which one to post to at completion */
 		pbAsync.thread	= me;
 
-		pbAsync.pb.ioParam.ioCompletion	= NewIOCompletionProc((ProcPtr)&AsyncIOCompletion);
+		pbAsync.pb.ioParam.ioCompletion	= sCompletionUPP;
 		pbAsync.pb.ioParam.ioResult		= noErr;
 		pbAsync.pb.ioParam.ioRefNum		= refNum;
 		pbAsync.pb.ioParam.ioBuffer		= buf;