--- a/userlibandfileserver/fileserver/sfile/sf_obj.cpp Thu Aug 19 11:14:22 2010 +0300
+++ b/userlibandfileserver/fileserver/sfile/sf_obj.cpp Tue Aug 31 16:34:26 2010 +0300
@@ -131,7 +131,10 @@
if (newAlloc)
{
iContainers=(CFsObjectCon**)User::ReAlloc(iContainers,newAlloc*sizeof(CFsObjectCon*));
- __ASSERT_DEBUG(iContainers,User::Panic(_L("FS_LDR panic"),ELdrHeapCorruptionOnRemove));
+ if(!iContainers)
+ {
+ Fault(EContainerHeapCorruptionOnRemove);
+ }
}
else
{
@@ -494,7 +497,10 @@
if (newAlloc)
{
iObjects=(SFsObjectIxRec*)User::ReAlloc(iObjects,newAlloc*sizeof(SFsObjectIxRec));
- __ASSERT_DEBUG(iObjects,User::Panic(_L("FS_LDR panic"),ELdrHeapCorruptionOnRemove));
+ if(!iObjects)
+ {
+ Fault(EContainerHeapCorruptionOnRemove);
+ }
}
else
{
@@ -687,7 +693,10 @@
if (newAlloc)
{
iObjects=(CFsObject**)User::ReAlloc(iObjects,newAlloc*sizeof(CFsObject*));
- __ASSERT_DEBUG(iObjects,User::Panic(_L("FS_LDR panic"),ELdrHeapCorruptionOnRemove));
+ if(!iObjects)
+ {
+ Fault(EContainerHeapCorruptionOnRemove);
+ }
}
else
{