userlibandfileserver/fileserver/sfile/sf_obj.cpp
branchRCL_3
changeset 44 3e88ff8f41d5
parent 43 c1f20ce4abcf
equal deleted inserted replaced
43:c1f20ce4abcf 44:3e88ff8f41d5
   129 			if (newAlloc!=iAllocated)
   129 			if (newAlloc!=iAllocated)
   130 				{
   130 				{
   131 				if (newAlloc)
   131 				if (newAlloc)
   132 				    {
   132 				    {
   133 					iContainers=(CFsObjectCon**)User::ReAlloc(iContainers,newAlloc*sizeof(CFsObjectCon*));
   133 					iContainers=(CFsObjectCon**)User::ReAlloc(iContainers,newAlloc*sizeof(CFsObjectCon*));
   134 					if(!iContainers)
   134 					__ASSERT_DEBUG(iContainers,User::Panic(_L("FS_LDR panic"),ELdrHeapCorruptionOnRemove));
   135 					    {
       
   136 					    Fault(EContainerHeapCorruptionOnRemove);
       
   137 					    }
       
   138 				    }
   135 				    }
   139 				else
   136 				else
   140 					{
   137 					{
   141 					delete iContainers;
   138 					delete iContainers;
   142 					iContainers=NULL;
   139 					iContainers=NULL;
   495 		if (newAlloc!=iAllocated)
   492 		if (newAlloc!=iAllocated)
   496 			{
   493 			{
   497 			if (newAlloc)
   494 			if (newAlloc)
   498 			    {
   495 			    {
   499 				iObjects=(SFsObjectIxRec*)User::ReAlloc(iObjects,newAlloc*sizeof(SFsObjectIxRec));
   496 				iObjects=(SFsObjectIxRec*)User::ReAlloc(iObjects,newAlloc*sizeof(SFsObjectIxRec));
   500 				if(!iObjects)
   497 				__ASSERT_DEBUG(iObjects,User::Panic(_L("FS_LDR panic"),ELdrHeapCorruptionOnRemove));
   501 				    {
       
   502                     Fault(EContainerHeapCorruptionOnRemove);
       
   503 				    }
       
   504 			    }
   498 			    }
   505 			else
   499 			else
   506 				{
   500 				{
   507 				delete iObjects;
   501 				delete iObjects;
   508 				iObjects=NULL;
   502 				iObjects=NULL;
   691 			if (newAlloc!=iAllocated)
   685 			if (newAlloc!=iAllocated)
   692 				{
   686 				{
   693 				if (newAlloc)
   687 				if (newAlloc)
   694 				    {
   688 				    {
   695 					iObjects=(CFsObject**)User::ReAlloc(iObjects,newAlloc*sizeof(CFsObject*));
   689 					iObjects=(CFsObject**)User::ReAlloc(iObjects,newAlloc*sizeof(CFsObject*));
   696 					if(!iObjects)
   690 					__ASSERT_DEBUG(iObjects,User::Panic(_L("FS_LDR panic"),ELdrHeapCorruptionOnRemove));
   697 					    {
       
   698 					    Fault(EContainerHeapCorruptionOnRemove);
       
   699 					    }
       
   700 				    }
   691 				    }
   701 				else
   692 				else
   702 					{
   693 					{
   703 					delete iObjects;
   694 					delete iObjects;
   704 					iObjects=NULL;
   695 					iObjects=NULL;