[Dotgnu-pnet-commits] pnet/cscc/csharp cs_grammar.y,1.69,1.70

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/cscc/csharp
In directory subversions:/tmp/cvs-serv29768/cscc/csharp

Modified Files:
        cs_grammar.y 
Log Message:


GetIndexerName: fix potential segv conditions.


Index: cs_grammar.y
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_grammar.y,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** cs_grammar.y        7 Nov 2003 01:23:55 -0000       1.69
--- cs_grammar.y        7 Nov 2003 22:10:46 -0000       1.70
***************
*** 412,418 ****
                                        args=(ILNode_List*)((ILNode_AttrArgs*)
                                                
(((ILNode_Attribute*)attr)->args))->positionalArgs;     
!                                       if(yyisa(args->item1, ILNode_ToConst))
                                        {
-                                               
ILNode_EvalConst(args->item1,info,&evalValue);
                                                
if(evalValue.valueType==ILMachineType_String)
                                                {
--- 412,418 ----
                                        args=(ILNode_List*)((ILNode_AttrArgs*)
                                                
(((ILNode_Attribute*)attr)->args))->positionalArgs;     
!                                       if(yyisa(args->item1, ILNode_ToConst) &&
!                                          
ILNode_EvalConst(args->item1,info,&evalValue))
                                        {
                                                
if(evalValue.valueType==ILMachineType_String)
                                                {
***************
*** 3194,3198 ****
        : OptAttributes OptModifiers IndexerDeclarator
                        StartAccessorBlock AccessorBlock                {
!                               ILNode* 
name=GetIndexerName(NULL,(ILNode_AttributeTree*)$1,
                                                        $3.ident);
                                ILUInt32 attrs = 
CSModifiersToPropertyAttrs($3.type, $2);
--- 3194,3198 ----
        : OptAttributes OptModifiers IndexerDeclarator
                        StartAccessorBlock AccessorBlock                {
!                               ILNode* 
name=GetIndexerName(&CCCodeGen,(ILNode_AttributeTree*)$1,
                                                        $3.ident);
                                ILUInt32 attrs = 
CSModifiersToPropertyAttrs($3.type, $2);
***************
*** 3798,3802 ****
                                                                 
IL_META_METHODDEF_SPECIAL_NAME |
                                                                 
IL_META_METHODDEF_NEW_SLOT;
!                               ILNode* 
name=GetIndexerName(NULL,(ILNode_AttributeTree*)$1,
                                                                
ILQualIdentSimple(NULL));
                                $$ = ILNode_PropertyDeclaration_create
--- 3798,3802 ----
                                                                 
IL_META_METHODDEF_SPECIAL_NAME |
                                                                 
IL_META_METHODDEF_NEW_SLOT;
!                               ILNode* 
name=GetIndexerName(&CCCodeGen,(ILNode_AttributeTree*)$1,
                                                                
ILQualIdentSimple(NULL));
                                $$ = ILNode_PropertyDeclaration_create