Magic-Mirror/androguard
1
0
Fork 0
mirror of https://github.com/androguard/androguard.git synced 2024-10-07 02:03:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1008 from Ch0pin/master

Browse Source 
Added error handling for ResParserError
This commit is contained in:
erev0s 2024-03-08 23:39:18 +02:00 committed by GitHub
commit aa2a63bf66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 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)