Skip to content

fix(java): use REPLACE_STUB_ID for unregistered writeReplace classes to prevent cross-JVM ClassNotFoundException #3638

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

Open
wakilurislam wants to merge 1 commit into
base: main
Choose a base branch
from
+420 −3
Open

fix(java): use REPLACE_STUB_ID for unregistered writeReplace classes to prevent cross-JVM ClassNotFoundException #3638

Show file tree
Hide file tree
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
15 changes: 12 additions & 3 deletions java/fory-core/src/main/java/org/apache/fory/resolver/ClassResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,13 @@ private int buildUserTypeId(Class<?> cls, Serializer<?> serializer) {

@Override
protected int buildUnregisteredTypeId(Class<?> cls, Serializer<?> serializer) {
if (serializer == null && !cls.isEnum() && useReplaceResolveSerializer(cls)) {
return Types.NAMED_EXT;
if (!cls.isEnum()) {
if (serializer instanceof ReplaceResolveSerializer) {
return REPLACE_STUB_ID;
}
if (serializer == null && useReplaceResolveSerializer(cls)) {
return Types.NAMED_EXT;
}
}
return super.buildUnregisteredTypeId(cls, serializer);
}
Expand Down Expand Up @@ -1215,7 +1220,11 @@ public void addSerializer(Class<?> type, Serializer<?> serializer) {
} else {
typeInfo = typeInfo.copy(typeId);
}
updateTypeInfo(type, typeInfo);
if (typeId == REPLACE_STUB_ID) {
classInfoMap.put(type, typeInfo);
} else {
updateTypeInfo(type, typeInfo);
}
// Add to compositeNameBytes2TypeInfo for unregistered classes so that
// readTypeInfo can find the TypeInfo by name bytes during deserialization.
// This is important for dynamically created classes that can't be loaded by name.
Expand Down
Loading
Loading