[Dotgnu-pnet-commits] CVS: pnet/image meta_writer.c,1.10,1.11

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/image
In directory subversions:/tmp/cvs-serv30021/image

Modified Files:
        meta_writer.c 
Log Message:


Format_ExportedType: check the scope for null before accessing it,
to prevent a segv (Bug #2678).


Index: meta_writer.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/image/meta_writer.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** meta_writer.c       28 Feb 2003 04:57:47 -0000      1.10
--- meta_writer.c       28 Feb 2003 11:35:03 -0000      1.11
***************
*** 656,660 ****
        values[IL_OFFSET_EXPTYPE_NAMESPACE] =
                        GetPersistString(image, 
type->classItem.className->namespace);
!       values[IL_OFFSET_EXPTYPE_FILE] = 
type->classItem.className->scope->token;
  }
  
--- 656,668 ----
        values[IL_OFFSET_EXPTYPE_NAMESPACE] =
                        GetPersistString(image, 
type->classItem.className->namespace);
!       if(type->classItem.className->scope)
!       {
!               values[IL_OFFSET_EXPTYPE_FILE] =
!                       type->classItem.className->scope->token;
!       }
!       else
!       {
!               values[IL_OFFSET_EXPTYPE_FILE] = 0;
!       }
  }