From ef5f24be48f42e94064a2e4acec41a2fe95519fc Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Fri, 1 Oct 2021 10:34:05 +0200
Subject: restore: Fix CheckpointMsg parsing for older firmware versions

Older firmware versions don't seem to always include CHECKPOINT_COMPLETE
so we assume that state is false instead of aborting with an error.
---
 src/restore.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/restore.c b/src/restore.c
index b1089bf..47c93dd 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -3764,7 +3764,7 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit
 		else if (!strcmp(type, "CheckpointMsg")) {
 			uint64_t ckpt_id;
 			uint64_t ckpt_res;
-			uint8_t ckpt_complete;
+			uint8_t ckpt_complete = 0;
 			// Get checkpoint id
 			node = plist_dict_get_item(message, "CHECKPOINT_ID");
 			if (!node || plist_get_node_type(node) != PLIST_UINT) {
@@ -3781,11 +3781,9 @@ int restore_device(struct idevicerestore_client_t* client, plist_t build_identit
 			plist_get_uint_val(node, &ckpt_res);
 			// Get checkpoint complete
 			node = plist_dict_get_item(message, "CHECKPOINT_COMPLETE");
-			if (!node || plist_get_node_type(node) != PLIST_BOOLEAN) {
-				debug("Failed to parse checkpoint result from checkpoint plist\n");
-				return -1;
+			if (PLIST_IS_BOOLEAN(node)) {
+				plist_get_bool_val(node, &ckpt_complete);
 			}
-			plist_get_bool_val(node, &ckpt_complete);
 			if (ckpt_complete)
 				info("Checkpoint %" PRIu64 " complete with code %" PRIu64 "\n", ckpt_id, ckpt_res);
 		}
-- 
cgit v1.1-32-gdbae