kotlin rename: check for valid identifiers

skylot · Nov 10, 2023 · e02830f · e02830f
1 parent a989fa7
commit e02830f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/pass/KotlinMetadataDecompilePass.kt b/...metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/pass/KotlinMetadataDecompilePass.kt
@@ -4,6 +4,7 @@ import jadx.api.plugins.input.data.AccessFlags
 import jadx.api.plugins.pass.JadxPassInfo
 import jadx.api.plugins.pass.impl.OrderedJadxPassInfo
 import jadx.api.plugins.pass.types.JadxDecompilePass
+import jadx.core.deobf.NameMapper
 import jadx.core.dex.attributes.AFlag
 import jadx.core.dex.attributes.nodes.RenameReasonAttr
 import jadx.core.dex.nodes.ClassNode
@@ -106,14 +107,14 @@ class KotlinMetadataDecompilePass(
 		val toString = wrapper.parseToString()
 		toString?.run {
 			clsAlias?.let { alias ->
-				if (AFlag.DONT_RENAME !in cls) {
+				if (NameMapper.isValidIdentifier(alias) && AFlag.DONT_RENAME !in cls) {
 					RenameReasonAttr.forNode(cls).append(TO_STRING_REASON)
 					cls.rename(alias)
 				}
 			}
 
 			fields.forEach { (field, alias) ->
-				if (AFlag.DONT_RENAME !in field) {
+				if (NameMapper.isValidIdentifier(alias) && AFlag.DONT_RENAME !in field) {
 					RenameReasonAttr.forNode(field).append(TO_STRING_REASON)
 					field.rename(alias)
 				}