Magic-Mirror/androguard
1
0
Fork 0
mirror of https://github.com/androguard/androguard.git synced 2024-11-23 05:00:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'refactor-analysis' of github.com:ehrenb/androguard into refactor-analysis

Browse Source
This commit is contained in:
ehrenb 2024-03-09 15:28:21 -05:00
commit 58ea8cfb9c
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
androguard/core/axml/__init__.py
View File

@ -2333,16 +2333,18 @@ class ARSCResTypeSpec:
self.id = unpack('<B', buff.read(1))[0]
self.res0 = unpack('<B', buff.read(1))[0]
self.res1 = unpack('<H', buff.read(2))[0]
if self.res0 != 0:
raise ResParserError("res0 must be zero!")
if self.res1 != 0:
raise ResParserError("res1 must be zero!")
self.entryCount = unpack('<I', buff.read(4))[0]
self.typespec_entries = []
for i in range(0, self.entryCount):
self.typespec_entries.append(unpack('<I', buff.read(4))[0])
try:
if self.res0 != 0:
raise ResParserError("res0 must be zero!")
if self.res1 != 0:
raise ResParserError("res1 must be zero!")
self.entryCount = unpack('<I', buff.read(4))[0]
self.typespec_entries = []
for i in range(0, self.entryCount):
self.typespec_entries.append(unpack('<I', buff.read(4))[0])
except ResParserError as e:
logger.warning(e)
class ARSCResType:
"""
@ -2935,11 +2937,14 @@ class ARSCResStringPoolRef:
self.size, = unpack("<H", buff.read(2))
self.res0, = unpack("<B", buff.read(1))
if self.res0 != 0:
raise ResParserError("res0 must be always zero!")
self.data_type = unpack('<B', buff.read(1))[0]
# data is interpreted according to data_type
self.data = unpack('<I', buff.read(4))[0]
try:
if self.res0 != 0:
raise ResParserError("res0 must be always zero!")
self.data_type = unpack('<B', buff.read(1))[0]
# data is interpreted according to data_type
self.data = unpack('<I', buff.read(4))[0]
except ResParserError as e:
logger.warning(e)
def get_data_value(self):
return self.parent.stringpool_main.getString(self.data)

3
androguard/core/dex/__init__.py
View File

@ -376,7 +376,8 @@ def determineNext(i, cur_idx, m):
# "the instructions must be located on even-numbered bytecode offsets (that is, 4-byte aligned).
# In order to meet this requirement, dex generation tools must
# emit an extra nop instruction as a spacer if such an instruction would otherwise be unaligned."
padding = (off + cur_idx) % 4
remaining = (off + cur_idx) % 4
padding = 0 if remaining == 0 else (4 - remaining)
if padding != 0:
logger.warning("Switch payload not aligned, assume stuff and add {} bytes...".format(padding))
data = code.get_ins_off(off + cur_idx + padding)