From 46b359cf214da58fc310d8e02245690d3c7f4325 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Tue, 5 May 2015 20:40:02 -0700
Subject: [PATCH] Fix an NPE related to an array descriptor just before an EOF

---
 smali/src/main/jflex/smaliLexer.jflex                  | 1 +
 smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/smali/src/main/jflex/smaliLexer.jflex b/smali/src/main/jflex/smaliLexer.jflex
index 545cd4b3..d7fd6cab 100644
--- a/smali/src/main/jflex/smaliLexer.jflex
+++ b/smali/src/main/jflex/smaliLexer.jflex
@@ -631,6 +631,7 @@ Type = {PrimitiveType} | {ClassDescriptor} | {ArrayPrefix} ({ClassDescriptor} |
    {PrimitiveType} { yybegin(YYINITIAL); return newToken(PRIMITIVE_TYPE); }
    {ClassDescriptor} { yybegin(YYINITIAL); return newToken(CLASS_DESCRIPTOR); }
    [^] { yypushback(1); yybegin(YYINITIAL); }
+   <<EOF>> { yybegin(YYINITIAL); }
 }
 
 /*Types*/
diff --git a/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java b/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java
index 7f8904d3..67e5945f 100644
--- a/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java
+++ b/smalidea/src/main/java/org/jf/smalidea/SmaliLexer.java
@@ -126,5 +126,6 @@ public class SmaliLexer extends LexerBase {
             token = (CommonToken)lexer.nextToken();
             state = lexer.yystate();
         }
+        assert token != null;
     }
 }