depth protection for computesequencelength, retain/autorelease remove…

…d for forked app git-svn-id: https://svn.code.sf.net/p/osirix/code/osirix@7504 4e9e6e3d-4551-47eb-9dbe-a6127f9400a1
pixmeo · Jul 27, 2010 · 2a6725b · 2a6725b
1 parent 89abc77
commit 2a6725b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/Binaries/dcmtk-source/dcmqrdb/dcmqrdbq.mm b/Binaries/dcmtk-source/dcmqrdb/dcmqrdbq.mm
@@ -610,7 +610,7 @@ void str_toupper(char *s)
 
 	// Search Core Data here
 	if( handle -> dataHandler == 0L)
-		handle -> dataHandler = [[OsiriXSCPDataHandler requestDataHandler] retain];
+		handle -> dataHandler = [OsiriXSCPDataHandler allocRequestDataHandler];
 
 	cond = [handle->dataHandler prepareFindForDataSet:findRequestIdentifiers];
 	MatchFound = [handle->dataHandler findMatchFound];
@@ -818,7 +818,7 @@ void str_toupper(char *s)
 	dbdebug(1, "nextFindResponse () : new dataset\n") ;
 
 	if( handle -> dataHandler == 0L)
-		handle -> dataHandler = [[OsiriXSCPDataHandler requestDataHandler] retain];
+		handle -> dataHandler = [OsiriXSCPDataHandler allocRequestDataHandler];
 
 	cond = [handle ->dataHandler nextFindObject:*findResponseIdentifiers  isComplete:&isComplete];
 	dbdebug(1, "nextFindResponse () : next response\n") ;
@@ -880,7 +880,7 @@ void str_toupper(char *s)
 	 status->setStatus(STATUS_Pending);
 	 /**** Goto the next matching image number  *****/
 	if( handle -> dataHandler == 0L)
-		handle -> dataHandler = [[OsiriXSCPDataHandler requestDataHandler] retain];
+		handle -> dataHandler = [OsiriXSCPDataHandler allocRequestDataHandler];
 
 	OFCondition cond = [handle->dataHandler nextMoveObject:imageFileName];
 	DcmFileFormat fileformat;
@@ -1069,7 +1069,7 @@ void str_toupper(char *s)
 	// Search Core Data here
 	//NSLog(@"search core data for move");
 	if( handle -> dataHandler == 0L)
-		handle -> dataHandler = [[OsiriXSCPDataHandler requestDataHandler] retain];
+		handle -> dataHandler = [OsiriXSCPDataHandler allocRequestDataHandler];
 
 	handle -> dataHandler.callingAET = [NSString stringWithUTF8String: handle -> callingAET];
 
@@ -1190,7 +1190,9 @@ void str_toupper(char *s)
 		DB_FreeElementList (handle -> findRequestList);
 		DB_FreeElementList (handle -> findResponseList);
 		DB_FreeUidList (handle -> uidList);
+
 		[handle -> dataHandler release];
+
 		free ( (char *) handle);
 		handle = nil;
 	}

diff --git a/OsiriXSCPDataHandler.h b/OsiriXSCPDataHandler.h
@@ -63,7 +63,7 @@ typedef struct
 
 @property (retain) NSString *callingAET;
 
-+ (id)requestDataHandler;
++ (id)allocRequestDataHandler;
 
 -(NSTimeInterval)endOfDay:(NSCalendarDate *)day;
 -(NSTimeInterval)startOfDay:(NSCalendarDate *)day;

diff --git a/OsiriXSCPDataHandler.mm b/OsiriXSCPDataHandler.mm
@@ -67,9 +67,9 @@ - (id)init
 	return self;
 }
 
-+ (id)requestDataHandler
++ (id)allocRequestDataHandler
 {
-	return [[[OsiriXSCPDataHandler alloc] init] autorelease];
+	return [[OsiriXSCPDataHandler alloc] init];
 }
 
 //- (NSPredicate *)predicateForObject:(DCMObject *)object

diff --git a/Papyrus3/PapyFiles3.c b/Papyrus3/PapyFiles3.c
@@ -1998,16 +1998,23 @@ ComputeUndefinedItemLength3 (PapyShort inFileNb, PapyULong *ioItemLengthP)
 /*										*/
 /********************************************************************************/
 
-PapyShort
-ComputeUndefinedSequenceLength3 (PapyShort inFileNb, PapyULong *ioSeqLengthP)
+static volatile int ComputeUndefinedSequenceLength3DepthProtection = 0;
+
+PapyShort ComputeUndefinedSequenceLength3 (PapyShort inFileNb, PapyULong *ioSeqLengthP)
 {
   PapyULong	theElemLength, theBufPos, theFileStartPos, i;
   PapyUShort	theGrNb, theElemNb;
   char		theVR [3];
   unsigned char	*theBuffP, theBuff [8];
   int 		OK, theErr = 0;
 
+  if( ComputeUndefinedSequenceLength3DepthProtection > 30)
+  {
+	  printf("\r******* ComputeUndefinedSequenceLength3DepthProtection \r");
+	  RETURN (papReadFile)
+  }
 
+  ComputeUndefinedSequenceLength3DepthProtection ++;
   /* initialisation */
   theGrNb         = 0;
   theElemNb       = 0;
@@ -2026,6 +2033,7 @@ ComputeUndefinedSequenceLength3 (PapyShort inFileNb, PapyULong *ioSeqLengthP)
     if (Papy3FRead (gPapyFile [inFileNb], &i, 1L, theBuffP) < 0)
     {
       Papy3FClose (&(gPapyFile [inFileNb]));
+	  ComputeUndefinedSequenceLength3DepthProtection --;
       RETURN (papReadFile)
     } /* if */
 
@@ -2066,6 +2074,7 @@ ComputeUndefinedSequenceLength3 (PapyShort inFileNb, PapyULong *ioSeqLengthP)
         if (Papy3FRead (gPapyFile [inFileNb], &i, 1L, theBuffP) < 0)
         {
 			Papy3FClose (&(gPapyFile [inFileNb]));
+			ComputeUndefinedSequenceLength3DepthProtection --;
 			RETURN (papReadFile)
         } /* if */
         *ioSeqLengthP += 4L;
@@ -2084,7 +2093,10 @@ ComputeUndefinedSequenceLength3 (PapyShort inFileNb, PapyULong *ioSeqLengthP)
       {
         theElemLength = 0L;
         if ((theErr = (int) ComputeUndefinedItemLength3 (inFileNb, &theElemLength)) < 0)
+		{
+		  ComputeUndefinedSequenceLength3DepthProtection --;
           RETURN (theErr);
+		}
       } /* if */
 
       *ioSeqLengthP += theElemLength;
@@ -2099,6 +2111,7 @@ ComputeUndefinedSequenceLength3 (PapyShort inFileNb, PapyULong *ioSeqLengthP)
   /* reset the file pointer to its previous position */
   Papy3FSeek (gPapyFile [inFileNb], (int) SEEK_SET, (PapyLong) theFileStartPos);
 
+  ComputeUndefinedSequenceLength3DepthProtection --;
   return 0;
 
 } /* endof ComputeUndefinedSequenceLength3 */

diff --git a/QueryController.mm b/QueryController.mm
@@ -2509,7 +2509,7 @@ - (void) performRetrieve:(NSArray*) array
 				[previousAutoRetrieve removeObjectForKey: [self stringIDForStudy: object]];
 			}
 
-			[NSThread currentThread].progress = (float) i++ / (float) [moveArray count];
+			[NSThread currentThread].progress = (float) ++i / (float) [moveArray count];
 			if( [NSThread currentThread].isCancelled)
 			{
 				[[NSFileManager defaultManager] createFileAtPath: @"/tmp/kill_all_storescu" contents: [NSData data] attributes: nil];

diff --git a/browserController.m b/browserController.m
@@ -11140,7 +11140,7 @@ - (void) copyToDB: (NSDictionary*) d
 		if( [NSThread currentThread].isCancelled)
 			break;
 
-		[NSThread currentThread].progress = (float) t++ / (float) [[d objectForKey: @"packArray"] count];
+		[NSThread currentThread].progress = (float) ++t / (float) [[d objectForKey: @"packArray"] count];
 		[NSThread currentThread].status = [NSString stringWithFormat: NSLocalizedString( @"%d file(s)", nil), [[d objectForKey: @"packArray"] count]-t];
 	}