svn commit: r153335 - jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java

[dbrosius]

Author: dbrosius
Date: Thu Feb 10 19:30:25 2005
New Revision: 153335

URL: http://svn.apache.org/viewcvs?view=rev&rev=153335
Log:
Apply Patch 19784 from Mark Crocker to guard against StackMap indexes being 
invalid for ITEM_Objects.

Modified:
    jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java

Modified: 
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java
URL: 
http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java?view=diff&r1=153334&r2=153335
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java 
(original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java Thu 
Feb 10 19:30:25 2005
@@ -95,9 +95,11 @@
   }
 
   private String printIndex() {
-    if(type == Constants.ITEM_Object)
-      return ", class=" + constant_pool.constantToString(index, 
Constants.CONSTANT_Class);
-    else if(type == Constants.ITEM_NewObject)
+    if(type == Constants.ITEM_Object) {
+        if (index < 0)
+          return ", class=<unknown>";
+        return ", class=" + constant_pool.constantToString(index, 
Constants.CONSTANT_Class);
+    } else if(type == Constants.ITEM_NewObject)
       return ", offset=" + index;
     else
       return "";



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]