Thread: [Fb-contrib-commit] SF.net SVN: fb-contrib:[1087] trunk/fb-contrib/src/com/mebigfatguy/ fbcontrib/

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1087
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1087&view=rev
Author:   dbrosius
Date:     2009-02-14 05:08:05 +0000 (Sat, 14 Feb 2009)

Log Message:
-----------
fix for [ 2494245 ] LEST False Positive

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java
===================================================================

--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java	2009-01-26 07:32:48 UTC (rev 1086)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LostExceptionStackTrace.java	2009-02-14 05:08:05 UTC (rev 1087)
@@ -35,6 +35,7 @@
 import org.apache.bcel.classfile.LocalVariable;
 import org.apache.bcel.classfile.LocalVariableTable;
 import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.Type;
 
 import com.mebigfatguy.fbcontrib.utils.Integer14;
 import com.mebigfatguy.fbcontrib.utils.RegisterUtils;
@@ -61,7 +62,7 @@
 		}
 	}
 	
-	private BugReporter bugReporter;
+	private final BugReporter bugReporter;
 	private OpcodeStack stack;
 	private CodeException[] exceptions;
 	private Set<CatchInfo> catchInfos;
@@ -173,7 +174,6 @@
                     }
 				} else if (pc == ex.getHandlerPC()) {
                     removePreviousHandlers(pc);
-                    
                 }
 			}
 			
@@ -189,16 +189,20 @@
 						it.remove();
 						break;
 					} else if ((pc > catchInfo.getStart()) && (pc <= catchInfo.getFinish())) {
-						if ((seen == INVOKESPECIAL) && ("<init>".equals(getNameConstantOperand()))) {
-							String className = getClassConstantOperand();
-							JavaClass exClass = Repository.lookupClass(className);
-							if (exClass.instanceOf(throwableClass)) {
-								String sig = getSigConstantOperand();
-								if ((sig.indexOf("Exception") >= 0)
-								||  (sig.indexOf("Throwable") >= 0)) {
-									markAsValid = true;
-									break;
+						if (seen == INVOKESPECIAL) {
+							if ("<init>".equals(getNameConstantOperand())) {
+								String className = getClassConstantOperand();
+								JavaClass exClass = Repository.lookupClass(className);
+								if (exClass.instanceOf(throwableClass)) {
+									String sig = getSigConstantOperand();
+									if ((sig.indexOf("Exception") >= 0)
+									||  (sig.indexOf("Throwable") >= 0)) {
+										markAsValid = true;
+										break;
+									}
 								}
+							} else if (isPossibleExBuilder(catchInfo.getRegister())) {
+								markAsValid = true;
 							}
 						} else if (seen == INVOKEVIRTUAL) {
                             if ("initCause".equals(getNameConstantOperand())) {
@@ -215,7 +219,12 @@
     							}
                             } else if ("getTargetException".equals(getNameConstantOperand()) && "java/lang/reflect/InvocationTargetException".equals(getClassConstantOperand())) {
                                 markAsValid = true;
-                            }
+							} else if (isPossibleExBuilder(catchInfo.getRegister())) {
+								markAsValid = true;
+							}
+						} else if (seen == INVOKEINTERFACE) {
+							if (isPossibleExBuilder(catchInfo.getRegister()))
+								markAsValid = true;
 						} else if (seen == ATHROW) {
 							if (stack.getStackDepth() > 0) {
 								OpcodeStack.Item itm = stack.getStackItem(0);
@@ -264,6 +273,33 @@
 		}
 	}
 	
+	/** returns whether the method called might be a method that builds an exception using
+	 * the original exception. It does so by looking to see if the method returns an exception,
+	 * and if one of the parameters is the original exception
+	 * @param exReg the register of the original exception caught
+	 * @return whether this method call could be an exception builder method
+	 */
+	public boolean isPossibleExBuilder(int exReg) throws ClassNotFoundException {
+		String sig = getSigConstantOperand();
+		Type returnType = Type.getReturnType(sig);
+		String returnSig = returnType.getSignature();
+		if (returnSig.startsWith("L")) {
+			returnSig = returnSig.substring(1, returnSig.length() - 1);
+			JavaClass retCls = Repository.lookupClass(returnSig);
+			if (retCls.instanceOf(throwableClass)) {
+				int numParms = Type.getArgumentTypes(sig).length;
+				if (stack.getStackDepth() >= numParms) {
+					for (int p = 0; p < numParms; p++) {
+						OpcodeStack.Item item = stack.getStackItem(p);
+						if (item.getRegisterNumber() == exReg)
+							return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
     /** returns whether the class in question was compiled with a jdk less than 1.4
      * 
      * @param exClass the class to check
@@ -329,7 +365,7 @@
 	}
 	
 	private static class CatchInfo {
-		private int catchStart;
+		private final int catchStart;
 		private int catchFinish;
 		private int exReg;
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Fb-contrib-commit] SF.net SVN: fb-contrib:[1087] trunk/fb-contrib/src/com/mebigfatguy/ fbcontrib/

fb-contrib-commit