You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/04/10 06:42:21 UTC

svn commit: r527019 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp

Author: varlax
Date: Mon Apr  9 21:42:20 2007
New Revision: 527019

URL: http://svn.apache.org/viewvc?view=rev&rev=527019
Log:
Minor fixes for HARMONY-3575 [drlvm] classfile parsing problems

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp?view=diff&rev=527019&r1=527018&r2=527019
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp Mon Apr  9 21:42:20 2007
@@ -1771,9 +1771,6 @@
                 }
                 
             }
-            if( num_lvtt_entries >= LV_ALLOCATION_THRESHOLD ){
-                STD_FREE(generic_vars);
-            }
         }
 
         if(TI_enabled) {
@@ -1782,6 +1779,9 @@
             if(num_lvt_entries >= LV_ALLOCATION_THRESHOLD) {
                 STD_FREE(lv_table);
             }
+            if( num_lvtt_entries >= LV_ALLOCATION_THRESHOLD ){
+                STD_FREE(generic_vars);
+            }
         }
         if (failed) {
             return false;
@@ -3159,7 +3159,7 @@
             //See specification 4.8.5 about InnerClasses Attribute
             if (m_declaring_class_index || m_innerclasses) {
                 REPORT_FAILED_CLASS_FORMAT(this, "more than one InnerClasses attribute");
-                return true;
+                return false;
             }
             bool isinner = false;
             // found_myself == 2: myself is not inner class or has passed myself when iterating inner class attribute arrays