Skip to content

Fixed creating chunk for field in wrapper with package-private type #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ class Hierarchy(private val typeRegistry: TypeRegistry) {
// Since wrapper UtThread does not inherit java.lang.Thread, we cannot use this inheritance condition only.
// The possible presence of hidden field is not important here - we just need
// to know whether we have at least one such field.
val realTypeHasFieldByName = realType.sootClass.getFieldUnsafe(field.subSignature) != null

// NOTE: we cannot use `getFieldByNameUnsafe` here because of possible hidden fields presence, and we also
// cannot use `ClassId::hasField` here because it use classloader to check it but we cannot load our wrappers.
// Also, we cannot `getFieldUnsafe` by signature of field, because, for example, `threadLocals` field in `UtThread`
// is declared with `Object` type since its real type is package-private.
val realTypeHasFieldByName = realType.sootClass.fields.any { it.name == field.name }
val realTypeIsInheritor = realFieldDeclaringType.sootClass in ancestors(realType.sootClass.id)

if (!realTypeIsInheritor && !realTypeHasFieldByName) {
Expand Down