Skip to content
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.

Sign up for GitHub

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

Jump to bottom

(0.22.0) Fix compile error #10524

Merged
merged 1 commit into from
Sep 4, 2020
Merged

(0.22.0) Fix compile error #10524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions runtime/bcverify/vrfyhelp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,16 +1023,16 @@ isProtectedAccessPermitted(J9BytecodeVerificationData *verifyData, J9UTF8* decla
if (currentRamClass->packageID == definingRamClass->packageID) return TRUE;

/* Determine if the defining class is the same class or a super class of current class */
if (isSameOrSuperClassOf (definingRamClass, currentRamClass)) {
U_8 * targetClassName;
UDATA targetClassLength;
J9Class * targetRamClass;
if (isSameOrSuperClassOf(definingRamClass, currentRamClass)) {
U_8 * targetClassName = NULL;
UDATA targetClassLength = 0;
J9Class * targetRamClass = NULL;

/* NULL is compatible */
if (targetClass != BCV_BASE_TYPE_NULL) {
/* Get the targetRamClass */
getNameAndLengthFromClassNameList (verifyData, J9CLASS_INDEX_FROM_CLASS_ENTRY(targetClass), &targetClassName, &targetClassLength);
targetRamClass = j9rtv_verifierGetRAMClass (verifyData, verifyData->classLoader, targetClassName, targetClassLength, reasonCode);
getNameAndLengthFromClassNameList(verifyData, J9CLASS_INDEX_FROM_CLASS_ENTRY(targetClass), &targetClassName, &targetClassLength);
targetRamClass = j9rtv_verifierGetRAMClass(verifyData, verifyData->classLoader, targetClassName, targetClassLength, reasonCode);
if (NULL == targetRamClass) {
return FALSE;
}
Expand All @@ -1041,14 +1041,12 @@ isProtectedAccessPermitted(J9BytecodeVerificationData *verifyData, J9UTF8* decla
/* flipped logic - currentRamClass is the same class or a super class of the target class */
if (J9ROMCLASS_IS_HIDDEN(romClass)) {
currentClassName = J9ROMCLASS_CLASSNAME(romClass);
if ((targetClassLength != J9UTF8_LENGTH(currentClassName))
|| (0 != strncmp(J9UTF8_DATA(currentClassName), targetClassName, targetClassLength))
) {
if (J9UTF8_DATA_EQUALS(targetClassName, targetClassLength, J9UTF8_DATA(currentClassName), J9UTF8_LENGTH(currentClassName))) {
/* fail if current class and target class are not the same */
return FALSE;
}
} else {
if (!isSameOrSuperClassOf (currentRamClass, targetRamClass)) {
if (!isSameOrSuperClassOf(currentRamClass, targetRamClass)) {
/* fail */
return FALSE;
}
Expand Down