From c92555319835f50077374865e98aec6aafe5be12 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Wed, 13 Dec 2023 13:15:19 -0400
Subject: [PATCH] Fix GMS crashes by aborting Java JSON read if a null/bad
 value is found

---
 .../java/es/chiteroman/playintegrityfix/EntryPoint.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
index 8470021..5952ffd 100644
--- a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
+++ b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
@@ -30,8 +30,9 @@ public final class EntryPoint {
                 map.put(reader.nextName(), reader.nextString());
             }
             reader.endObject();
-        } catch (IOException e) {
+        } catch (IOException|IllegalStateException e) {
             LOG("Couldn't read JSON from Zygisk: " + e);
+            map.clear();
             return;
         }
     }
@@ -84,8 +85,8 @@ public final class EntryPoint {
     }
 
     private static void setField(String name, String value) {
-        if (value == null || value.isEmpty()) {
-            LOG(String.format("%s is null, skipping...", name));
+        if (value.isEmpty()) {
+            LOG(String.format("%s is empty, skipping...", name));
             return;
         }