[GME-commit] GMESRC/GME/GMEActiveBrowser ActiveBrowserPropertyPage.cpp,1.30,1.31

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/GMEActiveBrowser
In directory braindrain:/tmp/cvs-serv31956/GME/GMEActiveBrowser

Modified Files:
	ActiveBrowserPropertyPage.cpp 
Log Message:
Serious memory leaks are detected in the browser.
Never return inside from MGACOLL_ITERATE !

CVS User: volgy

Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ActiveBrowserPropertyPage.cpp	13 Oct 2003 13:39:54 -0000	1.30
--- ActiveBrowserPropertyPage.cpp	13 May 2004 16:17:18 -0000	1.31
***************
*** 564,573 ****
  
  				// Iterate through the children FCOs
  				MGACOLL_ITERATE(IMgaFCO, ccpMgaFCOs) 
  				{						
  					// Recursive call for each children
! 					if(reqHasDisplayedChild(MGACOLL_ITER,nDepthLevel-1))return TRUE;						
  					
  				} MGACOLL_ITERATE_END;
  
  				
--- 564,580 ----
  
  				// Iterate through the children FCOs
+ 				bool doHasChild = false;
  				MGACOLL_ITERATE(IMgaFCO, ccpMgaFCOs) 
  				{						
  					// Recursive call for each children
! 					if(reqHasDisplayedChild(MGACOLL_ITER,nDepthLevel-1)){
! 						doHasChild = true;
! 						break;
! 					}						
  					
  				} MGACOLL_ITERATE_END;
+ 				if (doHasChild) {
+ 					return TRUE;
+ 				}
  
  				
***************
*** 585,593 ****
  	
  				// Iterate through the subfolders
  				MGACOLL_ITERATE(IMgaFolder, ccpChildFolders) 
  				{
  					// Recursive call to each child folder
! 					if(reqHasDisplayedChild(MGACOLL_ITER,nDepthLevel-1))return TRUE;
  				} MGACOLL_ITERATE_END;
  					
  				/********* Getting children FCOs **********/
--- 592,607 ----
  	
  				// Iterate through the subfolders
+ 				bool doHasChild = false;
  				MGACOLL_ITERATE(IMgaFolder, ccpChildFolders) 
  				{
  					// Recursive call to each child folder
! 					if(reqHasDisplayedChild(MGACOLL_ITER,nDepthLevel-1)) {
! 						doHasChild = true;
! 						break;
! 					}
  				} MGACOLL_ITERATE_END;
+ 				if (doHasChild) {
+ 					return TRUE;
+ 				}
  					
  				/********* Getting children FCOs **********/
***************
*** 598,603 ****
  				{
  					// Recursive call to each children
! 					if(reqHasDisplayedChild(MGACOLL_ITER,nDepthLevel-1))return TRUE;
  				} MGACOLL_ITERATE_END;
  
  			}break;
--- 612,623 ----
  				{
  					// Recursive call to each children
! 					if(reqHasDisplayedChild(MGACOLL_ITER,nDepthLevel-1)) {
! 						doHasChild = true;
! 						break;
! 					}
  				} MGACOLL_ITERATE_END;
+ 				if (doHasChild) {
+ 					return TRUE;
+ 				}
  
  			}break;