[DEX] Detected interned dex items

Author: REAndroid

src/main/java/com/reandroid/common/TextPosition.java

@@ -57,7 +57,7 @@ public String toString() {
         if(i == -1) {
             builder.append("--");
         }else {
-            builder.append(" line=");
+            builder.append("line=");
             builder.append(i);
         }
         i = getColumnNumber();

src/main/java/com/reandroid/dex/model/DexLayout.java

@@ -301,6 +301,10 @@ public void parseSmaliDirectory(File dir) throws IOException {
             reader.setOrigin(Origin.createNew(file));
             SmaliClass smaliClass = new SmaliClass();
             smaliClass.parse(reader);
+            if (containsClass(smaliClass.getKey())) {
+                throw new IOException(smaliClass.getOrigin() + " Class: "
+                        + smaliClass.getKey() + " has already been interned");
+            }
             layout.fromSmali(smaliClass);
         }
         sort();

src/main/java/com/reandroid/dex/smali/SmaliReader.java

@@ -18,6 +18,7 @@
 import com.reandroid.common.ByteSource;
 import com.reandroid.common.Origin;
 import com.reandroid.common.TextPosition;
+import com.reandroid.dex.key.Key;
 import com.reandroid.utils.HexUtil;
 import com.reandroid.utils.NumbersUtil;
 import com.reandroid.utils.io.IOUtil;
@@ -26,6 +27,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.HashSet;
+import java.util.Set;
 
 public class SmaliReader {
 
@@ -34,6 +37,8 @@ public class SmaliReader {
 
     private Origin origin;
 
+    private Set<Key> internedItems;
+
     public SmaliReader(ByteSource byteSource) {
         this.byteSource = byteSource;
     }
@@ -43,6 +48,7 @@ public SmaliReader(byte[] bytes) {
 
     public void reset() {
         this.position(0);
+        this.internedItems = null;
     }
     public int position() {
         return position;
@@ -448,9 +454,15 @@ public void skip(int amount) {
     public Origin getCurrentOrigin() {
         return getOrigin(position());
     }
+    public Origin getCurrentOrigin(boolean withDescription) {
+        return getOrigin(position(), withDescription);
+    }
     public Origin getOrigin(int position) {
+        return getOrigin(position, true);
+    }
+    public Origin getOrigin(int position, boolean withDescription) {
         Origin origin =  this.getOrigin();
-        origin = origin.createChild(new SmaliTextPosition(byteSource, position));
+        origin = origin.createChild(new SmaliTextPosition(byteSource, position, withDescription));
         return origin;
     }
     public Origin getOrigin() {
@@ -464,6 +476,17 @@ public Origin getOrigin() {
     public void setOrigin(Origin origin) {
         this.origin = origin;
     }
+    public boolean checkInterned(Key key) {
+        if (key == null) {
+            return false;
+        }
+        Set<Key> internedItems = this.internedItems;
+        if (internedItems == null) {
+            internedItems = new HashSet<>();
+            this.internedItems = internedItems;
+        }
+        return !internedItems.add(key);
+    }
 
     @Override
     public String toString() {
@@ -619,10 +642,12 @@ static class SmaliTextPosition extends TextPosition {
 
         private ByteSource byteSource;
         private final int position;
+        private final boolean withDescription;
 
-        public SmaliTextPosition(ByteSource byteSource, int position) {
+        public SmaliTextPosition(ByteSource byteSource, int position, boolean withDescription) {
             this.byteSource = byteSource;
             this.position = position;
+            this.withDescription = withDescription;
         }
 
         @Override
@@ -662,6 +687,9 @@ private void computeValues() {
             this.byteSource = null;
         }
         private String computePositionDescription(ByteSource byteSource) {
+            if (!withDescription) {
+                return null;
+            }
             int pos = this.position;
             if (pos >= byteSource.length()) {
                 return "EOF";

src/main/java/com/reandroid/dex/smali/model/SmaliClass.java

@@ -184,6 +184,7 @@ public void parse(SmaliReader reader) throws IOException {
         reader.skipWhitespacesOrComment();
         SmaliParseException.expect(reader, SmaliDirective.CLASS);
         setAccessFlags(AccessFlag.parse(reader));
+        setOrigin(reader.getCurrentOrigin(false));
         setKey(TypeKey.read(reader));
         while (parseNext(reader)) {
             reader.skipWhitespacesOrComment();

src/main/java/com/reandroid/dex/smali/model/SmaliField.java

@@ -154,6 +154,10 @@ public void parse(SmaliReader reader) throws IOException {
         setName(StringKey.readSimpleName(reader, ':'));
         reader.skip(1);
         setType(TypeKey.read(reader));
+        if (reader.checkInterned(getKey())) {
+            throw new IOException(reader.getCurrentOrigin(false) + " Field "
+                    + getKey() + " has already been interned");
+        }
         parseValue(reader);
         parseAnnotationSet(reader);
     }

src/main/java/com/reandroid/dex/smali/model/SmaliMethod.java

@@ -164,6 +164,10 @@ public void parse(SmaliReader reader) throws IOException {
         setHiddenApiFlags(HiddenApiFlag.parse(reader));
         setName(StringKey.readSimpleName(reader, '('));
         parseProto(reader);
+        if (reader.checkInterned(getKey())) {
+            throw new IOException(reader.getCurrentOrigin(false) + " Method "
+                    + getKey() + " has already been interned");
+        }
         reader.skipWhitespacesOrComment();
         while (parseNoneCode(reader)) {
             reader.skipWhitespacesOrComment();