From 201d8a97d4a6f54519cd8d72afc04cfc3536d9f4 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 18 Jul 2018 04:01:06 +0800 Subject: [PATCH] Prevent crashing on broken module.prop --- .../topjohnwu/magisk/container/BaseModule.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/full/java/com/topjohnwu/magisk/container/BaseModule.java b/src/full/java/com/topjohnwu/magisk/container/BaseModule.java index c22feafd6..1aeea8c4c 100644 --- a/src/full/java/com/topjohnwu/magisk/container/BaseModule.java +++ b/src/full/java/com/topjohnwu/magisk/container/BaseModule.java @@ -45,31 +45,32 @@ public abstract class BaseModule implements Comparable { continue; String key = prop[0].trim(); - if (key.charAt(0) == '#') + String value = prop[1].trim(); + if (key.isEmpty() || key.charAt(0) == '#') continue; switch (key) { case "id": - mId = prop[1]; + mId = value; break; case "name": - mName = prop[1]; + mName = value; break; case "version": - mVersion = prop[1]; + mVersion = value; break; case "versionCode": - mVersionCode = Integer.parseInt(prop[1]); + mVersionCode = Integer.parseInt(value); break; case "author": - mAuthor = prop[1]; + mAuthor = value; break; case "description": - mDescription = prop[1]; + mDescription = value; break; case "minMagisk": case "template": - minMagiskVersion = Integer.parseInt(prop[1]); + minMagiskVersion = Integer.parseInt(value); break; default: break;