mirrors/futurerestore
1
0
Fork 0
mirror of https://github.com/tihmstar/futurerestore.git synced 2025-01-04 19:45:31 +00:00
Code Issues Projects Releases Wiki Activity

fixed doublefree bug

Browse source
This commit is contained in:
tihmstar 2017-01-02 01:01:36 +01:00
parent 6145a56950
commit 3449c9dae8
1 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
futurerestore/futurerestore.cpp
View file

@ -298,29 +298,14 @@ int futurerestore::doRestore(const char *ipsw, bool noerase){
plist_dict_remove_item(client->tss, "BBTicket"); plist_dict_remove_item(client->tss, "BBTicket");
plist_dict_remove_item(client->tss, "BasebandFirmware"); plist_dict_remove_item(client->tss, "BasebandFirmware");
if (noerase) { if (!(build_identity = getBuildidentity(buildmanifest, client->device->product_type, noerase)))
build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(buildmanifest, client->device->hardware_model, "Update"); reterror(-5,"ERROR: Unable to find any build identities for IPSW\n");
if (!build_identity) {
build_identity = build_manifest_get_build_identity_for_model(buildmanifest, client->device->hardware_model);
}
}else{
build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(buildmanifest, client->device->hardware_model, "Erase");
if (build_identity == NULL) {
reterror(-5,"ERROR: Unable to find any build identities\n");
}
}
sep_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(_sepbuildmanifest, client->device->hardware_model, "Erase"); if (!(sep_build_identity = getBuildidentity(_sepbuildmanifest, client->device->product_type, noerase)))
if (!sep_build_identity) sep_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(_sepbuildmanifest, client->device->hardware_model, "Update"); reterror(-5,"ERROR: Unable to find any build identities for SEP\n");
if (sep_build_identity == NULL) {
reterror(-5,"ERROR: Unable to find any build identities for sep\n");
}
bb_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(_basebandbuildmanifest, client->device->hardware_model, "Erase"); if (!(bb_build_identity = getBuildidentity(_basebandbuildmanifest, client->device->product_type, noerase)))
if (!bb_build_identity) bb_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(_basebandbuildmanifest, client->device->hardware_model, "Update"); reterror(-5,"ERROR: Unable to find any build identities for Baseband\n");
if (bb_build_identity == NULL) {
reterror(-5,"ERROR: Unable to find any build identities for baseband\n");
}
plist_t bb_manifest = plist_dict_get_item(bb_build_identity, "Manifest"); plist_t bb_manifest = plist_dict_get_item(bb_build_identity, "Manifest");
@ -501,9 +486,6 @@ int futurerestore::doRestore(const char *ipsw, bool noerase){
error: error:
safeFree(client->sepfwdata); safeFree(client->sepfwdata);
safePlistFree(buildmanifest); safePlistFree(buildmanifest);
safePlistFree(build_identity);
safePlistFree(sep_build_identity);
safePlistFree(bb_build_identity);
if (delete_fs && filesystem) unlink(filesystem); if (delete_fs && filesystem) unlink(filesystem);
if (!result && !err) info("DONE\n"); if (!result && !err) info("DONE\n");
return result ? abs(result) : err; return result ? abs(result) : err;