fix: Support UTF-8 chars when compiling instructions in Smali in non UTF-8 environments (#331)

Tahgolov · web-flow · commit bb8771bb8b8a · 2025-01-07T01:30:21.000+01:00
diff --git a/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt b/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt
@@ -50,7 +50,7 @@ class InlineSmaliCompiler {
                     registers,
                     instructions,
                 )
-            val reader = InputStreamReader(input.byteInputStream())
+            val reader = InputStreamReader(input.byteInputStream(), Charsets.UTF_8)
             val lexer: LexerErrorInterface = smaliFlexLexer(reader, 15)
             val tokens = CommonTokenStream(lexer as TokenSource)
             val parser = smaliParser(tokens)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class InlineSmaliCompiler {`
`50`	`50`	`registers,`
`51`	`51`	`instructions,`
`52`	`52`	`)`
`53`		`- val reader = InputStreamReader(input.byteInputStream())`
	`53`	`+ val reader = InputStreamReader(input.byteInputStream(), Charsets.UTF_8)`
`54`	`54`	`val lexer: LexerErrorInterface = smaliFlexLexer(reader, 15)`
`55`	`55`	`val tokens = CommonTokenStream(lexer as TokenSource)`
`56`	`56`	`val parser = smaliParser(tokens)`