Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
714b9354
J
jadx
项目概览
keyescgm
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
714b9354
编写于
11月 04, 2020
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: improve checks for boolean to int conversion (#921)
上级
2a2b83a6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
178 addition
and
7 deletion
+178
-7
jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
...rc/main/java/jadx/core/dex/instructions/args/ArgType.java
+12
-0
jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java
...n/java/jadx/core/dex/instructions/args/PrimitiveType.java
+4
-0
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
...core/dex/visitors/typeinference/TypeInferenceVisitor.java
+12
-7
jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion2.java
...adx/tests/integration/types/TestPrimitiveConversion2.java
+22
-0
jadx-core/src/test/smali/types/TestPrimitiveConversion2.smali
...-core/src/test/smali/types/TestPrimitiveConversion2.smali
+128
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
浏览文件 @
714b9354
...
...
@@ -676,6 +676,18 @@ public abstract class ArgType {
||
(!
isTypeKnown
()
&&
contains
(
primitiveType
));
}
public
boolean
canBeAnyNumber
()
{
if
(
isPrimitive
())
{
return
!
getPrimitiveType
().
isObjectOrArray
();
}
for
(
PrimitiveType
primitiveType
:
getPossibleTypes
())
{
if
(!
primitiveType
.
isObjectOrArray
())
{
return
true
;
}
}
return
false
;
}
public
static
ArgType
convertFromPrimitiveType
(
PrimitiveType
primitiveType
)
{
switch
(
primitiveType
)
{
case
BOOLEAN:
...
...
jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java
浏览文件 @
714b9354
...
...
@@ -33,4 +33,8 @@ public enum PrimitiveType {
public
String
toString
()
{
return
longName
;
}
public
boolean
isObjectOrArray
()
{
return
this
==
OBJECT
||
this
==
ARRAY
;
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
浏览文件 @
714b9354
...
...
@@ -783,16 +783,21 @@ public final class TypeInferenceVisitor extends AbstractVisitor {
if
(
typeInfo
.
getType
().
isTypeKnown
())
{
return
false
;
}
boolean
boolAssign
=
false
;
for
(
ITypeBound
bound
:
typeInfo
.
getBounds
())
{
if
(
bound
.
getBound
()
==
BoundEnum
.
ASSIGN
&&
bound
.
getType
().
equals
(
ArgType
.
BOOLEAN
))
{
boolAssign
=
true
;
break
;
ArgType
boundType
=
bound
.
getType
();
switch
(
bound
.
getBound
())
{
case
ASSIGN:
if
(!
boundType
.
contains
(
PrimitiveType
.
BOOLEAN
))
{
return
false
;
}
break
;
case
USE:
if
(!
boundType
.
canBeAnyNumber
())
{
return
false
;
}
break
;
}
}
if
(!
boolAssign
)
{
return
false
;
}
boolean
fixed
=
false
;
for
(
ITypeBound
bound
:
typeInfo
.
getBounds
())
{
...
...
jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion2.java
0 → 100644
浏览文件 @
714b9354
package
jadx.tests.integration.types
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestPrimitiveConversion2
extends
SmaliTest
{
@Test
public
void
test
()
{
disableCompilation
();
assertThat
(
getClassNodeFromSmali
())
.
code
()
.
containsOne
(
"boolean z2 = !convertedPrice2.code.equals(itemCurrency.code);"
)
.
doesNotContain
(
"z2 == 0"
)
.
doesNotContain
(
"z2 | 2"
)
.
containsOne
(
"(z2 ? 1 : 0) | 2"
)
.
containsOne
(
"if (z2 && formatCurrency != null) {"
);
}
}
jadx-core/src/test/smali/types/TestPrimitiveConversion2.smali
0 → 100644
浏览文件 @
714b9354
.class public Ltypes/TestPrimitiveConversion2;
.super Ljava/lang/Object;
.method protected test(Landroid/widget/TextView;Lapp/ItemCurrency;Lapp/ItemCurrency;Lapp/ItemCurrency;Lapp/ItemCurrency;ZLapp/SearchListItem;)Z
.locals 4
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Landroid/widget/TextView;",
"Lapp/ItemCurrency;",
"Lapp/ItemCurrency;",
"Lapp/ItemCurrency;",
"Lapp/ItemCurrency;",
"ZTItem;)Z"
}
.end annotation
.line 573
invoke-direct {p0, p2, p3}, Lapp/DefaultItemAdapter;->getConvertedPrice(Lapp/ItemCurrency;Lapp/ItemCurrency;)Lapp/ItemCurrency;
move-result-object p3
const/4 v0, 0x0
if-eqz p3, :cond_3
.line 577
iget-object v1, p3, Lapp/ItemCurrency;->code:Ljava/lang/String;
iget-object p2, p2, Lapp/ItemCurrency;->code:Ljava/lang/String;
invoke-virtual {v1, p2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
const/4 v1, 0x1
xor-int/2addr p2, v1
or-int/lit8 v2, p2, 0x2
.line 581
iget-object v3, p3, Lapp/ItemCurrency;->value:Ljava/lang/String;
iget-object p3, p3, Lapp/ItemCurrency;->code:Ljava/lang/String;
invoke-virtual {p0, v3, p3, v2}, Lapp/ItemAdapter;->formatCurrency(Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;
move-result-object p3
if-eqz p2, :cond_0
if-eqz p3, :cond_0
.line 586
new-instance v1, Ljava/lang/StringBuilder;
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
invoke-virtual {v1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
const-string p3, " "
invoke-virtual {v1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object p3
const/4 v1, 0x2
:cond_0
if-eqz p6, :cond_1
if-eqz p7, :cond_1
.line 594
invoke-direct {p0, p4, p5}, Lapp/DefaultItemAdapter;->getConvertedPrice(Lapp/ItemCurrency;Lapp/ItemCurrency;)Lapp/ItemCurrency;
move-result-object p5
if-eqz p5, :cond_1
.line 598
iget-object p6, p5, Lapp/ItemCurrency;->code:Ljava/lang/String;
iget-object p4, p4, Lapp/ItemCurrency;->code:Ljava/lang/String;
invoke-virtual {p6, p4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p4
.line 599
iget-object p5, p5, Lapp/ItemCurrency;->code:Ljava/lang/String;
invoke-direct {p0, p5, p3, p7, p4}, Lapp/DefaultItemAdapter;->getPrice(Ljava/lang/String;Ljava/lang/String;Lapp/SearchListItem;Z)Landroid/text/Spannable;
move-result-object v0
:cond_1
if-nez v0, :cond_2
.line 605
sget-object p4, Landroid/graphics/Typeface;->DEFAULT:Landroid/graphics/Typeface;
invoke-virtual {p1, p4, v1}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;I)V
.line 606
invoke-virtual {p1, p3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
goto :goto_0
.line 609
:cond_2
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
goto :goto_0
.line 612
:cond_3
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
const/4 p2, 0x0
:goto_0
return p2
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录