From 6c17e1a14fb906b95afe82a2114ec1b6dc29fa73 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor@sourcetoad.com>
Date: Fri, 26 Apr 2019 15:17:03 -0400
Subject: [PATCH] fix: prevent NPE when key-element is null

---
 .../src/main/java/org/xmlpull/renamed/MXSerializer.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java b/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java
index ebcafc26..b18c0a48 100644
--- a/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java
+++ b/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java
@@ -888,6 +888,13 @@ public class MXSerializer implements XmlSerializer {
 
 	protected void writeElementContent(String text, Writer out)
 			throws IOException {
+
+		// For some reason, some non-empty, empty characters are surviving this far and getting filtered out
+		// So we are left with null, which causes an NPE
+		if (text == null) {
+			return;
+		}
+
 		// escape '<', '&', ']]>', <32 if necessary
 		int pos = 0;
 		for (int i = 0; i < text.length(); i++) {