From ef5da49bc0e07d92bdcef8c75dc1a0f1f94e7dc5 Mon Sep 17 00:00:00 2001 From: Soul Trace Date: Fri, 13 Dec 2019 21:16:08 +0300 Subject: [PATCH] fix(xml): reset nsMap in parse method (PR #798 #796) Fixes injection of xmlns: attributes from other files (#796) --- jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java index 3e777fe08..6987981bf 100644 --- a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java +++ b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java @@ -41,7 +41,7 @@ public class BinaryXMLParser extends CommonBinaryParser { private final Map styleMap = new HashMap<>(); private final Map resNames; - private final Map nsMap = new HashMap<>(); + private Map nsMap; private Set nsMapGenerated; private final Map tagAttrDeobfNames = new HashMap<>(); @@ -86,11 +86,13 @@ public class BinaryXMLParser extends CommonBinaryParser { return ResourcesLoader.loadToCodeWriter(inputStream); } nsMapGenerated = new HashSet<>(); + nsMap = new HashMap<>(); writer = new CodeWriter(); writer.add(""); firstElement = true; decode(); writer.finish(); + nsMap = null; return writer; }