Use plist_from_memory instead of plist_from_bin/xml

libimobiledevice · Jul 20, 2023 · 7ae455f · 7ae455f
1 parent bd618e0
commit 7ae455f
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/src/ideviceinstaller.c b/src/ideviceinstaller.c
@@ -1181,11 +1181,7 @@ int main(int argc, char **argv)
 			free(filename);
 
 			plist_t info = NULL;
-			if (memcmp(ibuf, "bplist00", 8) == 0) {
-				plist_from_bin(ibuf, filesize, &info);
-			} else {
-				plist_from_xml(ibuf, filesize, &info);
-			}
+			plist_from_memory(ibuf, filesize, &info, NULL);
 			free(ibuf);
 
 			if (!info) {
@@ -1215,13 +1211,12 @@ int main(int argc, char **argv)
 				zbuf = buf_from_file(extmeta, &flen);
 				if (zbuf && flen) {
 					meta = plist_new_data(zbuf, flen);
-					if (memcmp(zbuf, "bplist00", 8) == 0) {
-						plist_from_bin(zbuf, flen, &meta_dict);
-					} else {
-						plist_from_xml(zbuf, flen, &meta_dict);
-					}
+					plist_from_memory(zbuf, flen, &meta_dict, NULL);
 					free(zbuf);
-				} else {
+				}
+				if (!meta_dict) {
+					plist_free(meta);
+					meta = NULL;
 					fprintf(stderr, "WARNING: could not load external iTunesMetadata %s!\n", extmeta);
 				}
 				zbuf = NULL;
@@ -1231,12 +1226,11 @@ int main(int argc, char **argv)
 				/* extract iTunesMetadata.plist from package */
 				if (zip_get_contents(zf, ITUNES_METADATA_PLIST_FILENAME, 0, &zbuf, &len) == 0) {
 					meta = plist_new_data(zbuf, len);
-					if (memcmp(zbuf, "bplist00", 8) == 0) {
-						plist_from_bin(zbuf, len, &meta_dict);
-					} else {
-						plist_from_xml(zbuf, len, &meta_dict);
-					}
-				} else {
+					plist_from_memory(zbuf, len, &meta_dict, NULL);
+				}
+				if (!meta_dict) {
+					plist_free(meta);
+					meta = NULL;
 					fprintf(stderr, "WARNING: could not locate %s in archive!\n", ITUNES_METADATA_PLIST_FILENAME);
 				}
 				free(zbuf);
@@ -1269,11 +1263,7 @@ int main(int argc, char **argv)
 				goto leave_cleanup;
 			}
 			free(filename);
-			if (memcmp(zbuf, "bplist00", 8) == 0) {
-				plist_from_bin(zbuf, len, &info);
-			} else {
-				plist_from_xml(zbuf, len, &info);
-			}
+			plist_from_memory(zbuf, len, &info, NULL);
 			free(zbuf);
 
 			if (!info) {