Skip to content

fix: Custom reader should read till endblock #61

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
svaningelgem wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: Custom reader should read till endblock #61

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14aa441
Adding test data
svaningelgem Jun 9, 2025
67c629f
Changed code
svaningelgem Jun 9, 2025
eebea7e
Fixed the issue.
svaningelgem Jun 9, 2025
1bf2a23
Only an issue under v1, not v2
svaningelgem Jun 9, 2025
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
Prev Previous commit
Next Next commit
Changed code
  • Loading branch information
@svaningelgem
svaningelgem committed Jun 9, 2025
commit 67c629f9f777b828faa59a47c3c070fe3ac56d1e
98 changes: 27 additions & 71 deletions javaobj/v1/unmarshaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,87 +515,43 @@ def do_object(self, parent=None, ident=0):
raise NotImplementedError("externalContents isn't implemented yet")

if classdesc.flags & ClassDescFlags.SC_SERIALIZABLE:
# TODO: look at ObjectInputStream.readSerialData()
# FIXME: Handle the SC_WRITE_METHOD flag

# create megalist
tempclass = classdesc
megalist = []
megatypes = []
log_debug("Constructing class...", ident)
while tempclass:
log_debug("Class: {0}".format(tempclass.name), ident + 1)
class_fields_str = " - ".join(
" ".join((str(field_type), field_name))
for field_type, field_name in zip(
tempclass.fields_types, tempclass.fields_names
)
)
if class_fields_str:
log_debug(class_fields_str, ident + 2)
# Handle each class in the hierarchy separately, from most derived to root
self._read_class_data(java_object, classdesc, ident)

fieldscopy = tempclass.fields_names[:]
fieldscopy.extend(megalist)
megalist = fieldscopy
log_debug(">>> java_object: {0}".format(java_object), ident)
return java_object

fieldscopy = tempclass.fields_types[:]
fieldscopy.extend(megatypes)
megatypes = fieldscopy
def _read_class_data(self, java_object, classdesc, ident):
"""
Recursively reads class data for the inheritance hierarchy
"""
if classdesc is None:
return

tempclass = tempclass.superclass
# First, handle the superclass data
if classdesc.superclass is not None:
self._read_class_data(java_object, classdesc.superclass, ident)

log_debug("Values count: {0}".format(len(megalist)), ident)
log_debug("Prepared list of values: {0}".format(megalist), ident)
log_debug("Prepared list of types: {0}".format(megatypes), ident)
# Then handle this class's data
log_debug("Reading class data for: {0}".format(classdesc.name), ident)

for field_name, field_type in zip(megalist, megatypes):
log_debug(
"Reading field: {0} - {1}".format(field_type, field_name)
)
res = self._read_value(field_type, ident, name=field_name)
java_object.__setattr__(field_name, res)
# Read field values for this specific class
for field_name, field_type in zip(classdesc.fields_names, classdesc.fields_types):
log_debug("Reading field: {0} - {1}".format(field_type, field_name), ident)
res = self._read_value(field_type, ident, name=field_name)
java_object.__setattr__(field_name, res)

if (
classdesc.flags & ClassDescFlags.SC_SERIALIZABLE
and classdesc.flags & ClassDescFlags.SC_WRITE_METHOD
or classdesc.flags & ClassDescFlags.SC_EXTERNALIZABLE
and classdesc.flags & ClassDescFlags.SC_BLOCK_DATA
or classdesc.superclass is not None
and classdesc.superclass.flags & ClassDescFlags.SC_SERIALIZABLE
and classdesc.superclass.flags & ClassDescFlags.SC_WRITE_METHOD
):
# objectAnnotation
log_debug(
"java_object.annotations before: {0}".format(
java_object.annotations
),
ident,
)
# Handle annotations if this class has the SC_WRITE_METHOD flag
if classdesc.flags & ClassDescFlags.SC_WRITE_METHOD:
log_debug("Reading annotations for class: {0}".format(classdesc.name), ident)

while opcode != TerminalCode.TC_ENDBLOCKDATA:
while True:
opcode, obj = self._read_and_exec_opcode(ident=ident + 1)
# , expect=[self.TC_ENDBLOCKDATA, self.TC_BLOCKDATA,
# self.TC_OBJECT, self.TC_NULL, self.TC_REFERENCE])
if opcode != TerminalCode.TC_ENDBLOCKDATA:
java_object.annotations.append(obj)

if opcode == TerminalCode.TC_ENDBLOCKDATA:
break
java_object.annotations.append(obj)
log_debug("objectAnnotation value: {0}".format(obj), ident)

log_debug(
"java_object.annotations after: {0}".format(
java_object.annotations
),
ident,
)

# Allow extra loading operations
if hasattr(java_object, "__extra_loading__"):
log_debug("Java object has extra loading capability.")
java_object.__extra_loading__(self, ident)

log_debug(">>> java_object: {0}".format(java_object), ident)
return java_object

def do_string(self, parent=None, ident=0):
"""
Handles a TC_STRING opcode
Expand Down