Changeset 638 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

Jun 12, 2008, 11:02:32 PM (16 years ago)

Author:

dai_9181

Message:

配列範囲外にアクセスしてしまう危険性があったので修正。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/NumOpe_GetType.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -193 +193 @@
 }
 
-int GetReturnType_OperatorProc(int idCalc,const Type &baseType,int *type_stack,LONG_PTR *index_stack,int &sp){
+int GetReturnType_OperatorProc(int idCalc,const Type &baseType,int *type_stack,LONG_PTR *index_stack,int &sp)
+{
+    if( sp < 2 )
+    {
+        Jenga::Throw( "GetReturnType_OperatorProcのspが2以下" );
+    }
+
     Type leftType( type_stack[sp-2], index_stack[sp-2] );
     Type rightType( type_stack[sp-1] & (~FLAG_CAST), index_stack[sp-1] );
@@ -708 +714 @@
         idCalc=calc[i]%100;
 
-        if(idCalc){
+        if(idCalc && sp >= 2){
             if(type_stack[sp-2]==DEF_OBJECT){
                 if( idCalc == CALC_AS