Fixes btraceio#237: NPE in logs when trying to run unsafe script without unsafe mode enabled

jbachorik · jbachorik · commit 82112f9058af · 2016-08-03T19:59:19.000+02:00
diff --git a/src/share/classes/com/sun/btrace/VerifierException.java b/src/share/classes/com/sun/btrace/VerifierException.java
@@ -25,7 +25,7 @@
 
 package com.sun.btrace;
 
-/** 
+/**
  * Instance of this exception type is thrown by BTrace
  * Verifier when an input .class is not a valid BTrace program.
  *
@@ -35,4 +35,8 @@ public class VerifierException extends RuntimeException {
     public VerifierException(String msg) {
         super(msg);
     }
+
+    public VerifierException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/src/share/classes/com/sun/btrace/agent/Client.java b/src/share/classes/com/sun/btrace/agent/Client.java
@@ -210,7 +210,10 @@ protected final Class loadClass(InstrumentCommand instr) throws IOException {
         String[] args = instr.getArguments();
         this.btraceCode = instr.getCode();
         try {
-            probe = verifyAndLoad(btraceCode);
+            probe = load(btraceCode);
+            if (!probe.isVerified()) {
+                throw probe.getVerifierException();
+            }
         } catch (Throwable th) {
             debugPrint(th);
             errorExit(th);
@@ -304,7 +307,7 @@ final BTraceRuntime getRuntime() {
     }
 
     protected final String getClassName() {
-        return probe.getClassName();
+        return probe != null ? probe.getClassName() : "<unknown>";
     }
 
     final boolean isCandidate(Class c) {
@@ -340,13 +343,17 @@ final void endRetransformClasses() {
     }
 
     // Internals only below this point
-    private BTraceProbe verifyAndLoad(byte[] buf) {
+    private BTraceProbe load(byte[] buf) {
         BTraceProbeFactory f = new BTraceProbeFactory(settings);
         debugPrint("loading BTrace class");
         BTraceProbe cn = f.createProbe(buf);
 
         if (isDebug()) {
-            debugPrint("loaded '" + cn.getClassName() + "' successfully");
+            if (cn.isVerified()) {
+                debugPrint("loaded '" + cn.getClassName() + "' successfully");
+            } else {
+                debugPrint(cn.getClassName() + " failed verification");
+            }
         }
         return cn;
     }
diff --git a/src/share/classes/com/sun/btrace/runtime/BTraceProbe.java b/src/share/classes/com/sun/btrace/runtime/BTraceProbe.java
@@ -26,6 +26,7 @@
 
 import com.sun.btrace.BTraceRuntime;
 import com.sun.btrace.DebugSupport;
+import com.sun.btrace.VerifierException;
 import com.sun.btrace.comm.RetransformClassNotification;
 import com.sun.btrace.org.objectweb.asm.AnnotationVisitor;
 import com.sun.btrace.org.objectweb.asm.ClassReader;
@@ -74,6 +75,7 @@ public final class BTraceProbe extends ClassNode {
     private BTraceTransformer transformer;
     private boolean subtypeMatcher = false;
     private boolean annotationMatcher = false;
+    private VerifierException verifierException = null;
 
     private BTraceProbe(BTraceProbeFactory factory) {
         super(Opcodes.ASM5);
@@ -289,6 +291,14 @@ public boolean isClassRenamed() {
         return classRenamed;
     }
 
+    public boolean isVerified() {
+        return verifierException == null;
+    }
+
+    public VerifierException getVerifierException() {
+        return verifierException;
+    }
+
     boolean isFieldInjected(String name) {
         return injectedFields.contains(name);
     }
@@ -404,6 +414,8 @@ private void initialize(ClassReader cr) {
             }
             mapOnProbes();
             this.filter = new ClassFilter(onMethods);
+        } catch (VerifierException e) {
+            verifierException = e;
         } finally {
             if (debug.isDumpClasses()) {
                 debug.dumpClass(name, getBytecode(false));

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`package com.sun.btrace;`
`27`	`27`
`28`		`-/**`
	`28`	`+/**`
`29`	`29`	`* Instance of this exception type is thrown by BTrace`
`30`	`30`	`* Verifier when an input .class is not a valid BTrace program.`
`31`	`31`	`*`
`@@ -35,4 +35,8 @@ public class VerifierException extends RuntimeException {`
`35`	`35`	`public VerifierException(String msg) {`
`36`	`36`	`super(msg);`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ public VerifierException(Throwable cause) {`
	`40`	`+ super(cause);`
	`41`	`+ }`
`38`	`42`	`}`