Skip to content

Fix: Handle plist error in duetLocations #1406

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
amadheatrizza wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −4
Open

Fix: Handle plist error in duetLocations #1406

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: 11 additions & 4 deletions scripts/artifacts/duetLocations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@ def get_duetLocations(files_found, report_folder, seeker, wrap_text, timezone_of
else:
try:
plist = nd.deserialize_plist_from_string(datos)

if not isinstance(plist, dict) or len(plist) == 0:
logfunc(f'Plist is empty or not a dictionary (iOS 16.3+): {type(plist)}')
continue

timestamp = latitude = longitude = horzacc = altitude = speed = ''

for key, value in plist.items():
#print(key, value)
if key == 'kCLLocationCodingKeyCoordinateLongitude':
Expand All @@ -145,13 +152,13 @@ def get_duetLocations(files_found, report_folder, seeker, wrap_text, timezone_of
altitude = value
elif key == 'kCLLocationCodingKeySpeed':
speed = value
data_list.append((timestamp,latitude,longitude,horzacc,altitude,speed))
timestamp = latitude = longitude = horzacc, altitude = ''

if latitude != '' and longitude != '':
data_list.append((timestamp, latitude, longitude, horzacc, altitude, speed))

except (nd.DeserializeError, nd.biplist.NotBinaryPlistException, nd.biplist.InvalidPlistException,
nd.plistlib.InvalidFileException, nd.ccl_bplist.BplistError, ValueError, TypeError, OSError, OverflowError) as ex:
logfunc(f'Failed to read plist, error was:' + str(ex))
logfunc(f'Failed to read plist, error was: {str(ex)}')

modresult = (sizeofnotificaton % 8)
resultante = 8 - modresult
Expand Down