diff options
| author |  Nikias Bassen | 2014-03-24 02:30:05 +0100 |
|---|---|---|
| committer | Nikias Bassen | 2014-03-24 02:30:05 +0100 |
| commit | 79e45062502eec95526b50135d2bce95523c1794 (patch) | |
| tree | ca80d0cba5955b1751128756e0078dca97b7946f | |
| parent | a3bc066c5a40141e548e9ab08f0602b6b3cc5d8f (diff) | |
| download | libimobiledevice-79e45062502eec95526b50135d2bce95523c1794.tar.gz libimobiledevice-79e45062502eec95526b50135d2bce95523c1794.tar.bz2 | |
lockdown: Prevent libplist assertion by checking result of userpref_read_pair_record()
| -rw-r--r-- | src/lockdown.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lockdown.c b/src/lockdown.c index 9b91dff..99bcbb5 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -752,8 +752,9 @@ lockdownd_error_t lockdownd_client_new_with_handshake(idevice_t device, lockdown plist_t pair_record = NULL; userpref_read_pair_record(client_loc->udid, &pair_record); - - pair_record_get_host_id(pair_record, &host_id); + if (pair_record) { + pair_record_get_host_id(pair_record, &host_id); + } if (LOCKDOWN_E_SUCCESS == ret && !host_id) { ret = LOCKDOWN_E_INVALID_CONF; } @@ -783,8 +784,10 @@ lockdownd_error_t lockdownd_client_new_with_handshake(idevice_t device, lockdown if (LOCKDOWN_E_SUCCESS == ret) { if (!host_id) { userpref_read_pair_record(client_loc->udid, &pair_record); - pair_record_get_host_id(pair_record, &host_id); - plist_free(pair_record); + if (pair_record) { + pair_record_get_host_id(pair_record, &host_id); + plist_free(pair_record); + } } ret = lockdownd_start_session(client_loc, host_id, NULL, NULL); @@ -950,6 +953,9 @@ static lockdownd_error_t lockdownd_do_pair(lockdownd_client_t client, lockdownd_ /* use existing pair record */ if (userpref_has_pair_record(client->udid)) { userpref_read_pair_record(client->udid, &pair_record_plist); + if (!pair_record_plist) { + return LOCKDOWN_E_INVALID_CONF; + } } else { return LOCKDOWN_E_INVALID_HOST_ID; } |