From 9aecb77820044be67a7048c3196ca00080d05283 Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Fri, 7 May 1999 22:58:41 +0000
Subject: [PATCH] bug fix: Some NullPointerExceptions

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@800 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/obfuscator/LocalOptimizer.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jode/jode/obfuscator/LocalOptimizer.java b/jode/jode/obfuscator/LocalOptimizer.java
index 9d2b117..406a60d 100644
--- a/jode/jode/obfuscator/LocalOptimizer.java
+++ b/jode/jode/obfuscator/LocalOptimizer.java
@@ -707,7 +707,7 @@ public class LocalOptimizer implements Opcodes {
 		}
 	    }
 
-	    if (instr.opcode == opc_ret) {
+	    if (info.jsrTargetInfo != null) {
 		/* On a ret we do a special merge */
 
 		Instruction jsrTargetInstr = info.jsrTargetInfo.instr;
@@ -749,6 +749,7 @@ public class LocalOptimizer implements Opcodes {
 		    : null;
 		if (lcl != currentLocal[i]
 		    && (lcl == null || currentLocal[i] == null
+			|| lcl.name == null || lcl.type == null
 			|| !lcl.name.equals(currentLocal[i].name)
 			|| !lcl.type.equals(currentLocal[i].type))) {
 		    if (lvi[i] != null) {
@@ -757,7 +758,8 @@ public class LocalOptimizer implements Opcodes {
 		    lvi[i] = null;
 		    currentLocal[i] = lcl;
 		    if (currentLocal[i] != null
-			&& currentLocal[i].name != null) {
+			&& currentLocal[i].name != null
+			&& currentLocal[i].type != null) {
 			lvi[i] = new LocalVariableInfo();
 			lvtEntries.addElement(lvi[i]);
 			lvi[i].name = currentLocal[i].name;