140086 2015-01-05 12:01:51 -0800 Clean up the storage manager some more 2015-02-22 08:24:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca zan oldest_to_newest 1058754 0 andersca 2015-01-05 12:01:51 -0800 Clean up the storage manager some more 1058755 1 243985 andersca 2015-01-05 12:03:59 -0800 Created attachment 243985 Patch 1058756 2 243985 kling 2015-01-05 12:06:40 -0800 Comment on attachment 243985 Patch r=me 1058757 3 andersca 2015-01-05 12:07:20 -0800 Committed r177921: <http://trac.webkit.org/changeset/177921> 1071070 4 zan 2015-02-22 08:24:58 -0800 *** Bug 138015 has been marked as a duplicate of this bug. *** 243985 2015-01-05 12:03:59 -0800 2015-01-05 12:06:40 -0800 Patch bug-140086-20150105120403.patch text/plain 11147 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2VhOWIyNDkyZGI4NzNm NmY4NWY1ZGE0YTQ2MjI2MzRjOTRkMmE2OS4uMzgxZDgzNDhhNWZhZTFiYzQxZDQzZTg2N2Y5ZDYz MjdlMDIwMTBjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE1LTAxLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgdGhl IHN0b3JhZ2UgbWFuYWdlciBzb21lIG1vcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MDA4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVzZSBsYW1iZGFzIGluc3RlYWQgb2YgV1RGOjpiaW5kIGFuZCBn ZXQgcmlkIG9mIGEgY291cGxlIG9mIGludGVybmFsIGZ1bmN0aW9ucy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3Rv cmFnZU1hbmFnZXI6OmNyZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKToKKyAgICAgICAgKFdl YktpdDo6U3RvcmFnZU1hbmFnZXI6OmRlc3Ryb3lTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk6Cisg ICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpzZXRBbGxvd2VkU2Vzc2lvblN0b3JhZ2VO YW1lc3BhY2VDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmNs b25lU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFu YWdlcjo6cHJvY2Vzc1dpbGxDbG9zZUNvbm5lY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpTdG9y YWdlTWFuYWdlcjo6Y3JlYXRlU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpkZXN0cm95U2Vzc2lvblN0b3Jh Z2VOYW1lc3BhY2VJbnRlcm5hbCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VN YW5hZ2VyOjpzZXRBbGxvd2VkU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VDb25uZWN0aW9uSW50ZXJu YWwpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y2xvbmVTZXNz aW9uU3RvcmFnZU5hbWVzcGFjZUludGVybmFsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6 U3RvcmFnZU1hbmFnZXI6OmludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwpOiBEZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmg6CisKKzIwMTUtMDEt MDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBDaGFu Z2UgbW9yZSBjb25uZWN0aW9uIHBvaW50ZXJzIHRvIHJlZmVyZW5jZXMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDA4NQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggMDQ1 NjBmYThjNTQwMzIyMGY4ZDkwNTE3M2RhOGUwODMxZTczMzg1YS4uYmY1MjdmMDA1NzdiMDEyMmM2 ODhhYmJmMjg4NGMwMTk0YTJiYTc5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNDM1LDIyICs0MzUsNTYgQEAgU3Rv cmFnZU1hbmFnZXI6On5TdG9yYWdlTWFuYWdlcigpCiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNy ZWF0ZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwg SVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVz KQogewotICAgIG1fcXVldWUtPmRpc3BhdGNoKGJpbmQoJlN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVT ZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUludGVybmFsLCB0aGlzLCBzdG9yYWdlTmFtZXNwYWNlSUQs IFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+KGFsbG93ZWRDb25uZWN0aW9uKSwgcXVvdGFJbkJ5dGVz KSk7CisgICAgUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyPiBzdG9yYWdlTWFuYWdlcih0aGlzKTsKKyAg ICBSZWZQdHI8SVBDOjpDb25uZWN0aW9uPiBjb25uZWN0aW9uKGFsbG93ZWRDb25uZWN0aW9uKTsK KworICAgIG1fcXVldWUtPmRpc3BhdGNoKFtzdG9yYWdlTWFuYWdlciwgY29ubmVjdGlvbiwgc3Rv cmFnZU5hbWVzcGFjZUlELCBxdW90YUluQnl0ZXNdIHsKKyAgICAgICAgQVNTRVJUKCFzdG9yYWdl TWFuYWdlci0+bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuY29udGFpbnMoc3RvcmFnZU5hbWVz cGFjZUlEKSk7CisKKyAgICAgICAgc3RvcmFnZU1hbmFnZXItPm1fc2Vzc2lvblN0b3JhZ2VOYW1l c3BhY2VzLnNldChzdG9yYWdlTmFtZXNwYWNlSUQsIFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlOjpj cmVhdGUoY29ubmVjdGlvbi5nZXQoKSwgcXVvdGFJbkJ5dGVzKSk7CisgICAgfSk7CiB9CiAKIHZv aWQgU3RvcmFnZU1hbmFnZXI6OmRlc3Ryb3lTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSh1aW50NjRf dCBzdG9yYWdlTmFtZXNwYWNlSUQpCiB7Ci0gICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3Rv cmFnZU1hbmFnZXI6OmRlc3Ryb3lTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUludGVybmFsLCB0aGlz LCBzdG9yYWdlTmFtZXNwYWNlSUQpKTsKKyAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0b3Jh Z2VNYW5hZ2VyKHRoaXMpOworCisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3N0b3JhZ2VNYW5hZ2Vy LCBzdG9yYWdlTmFtZXNwYWNlSURdIHsKKyAgICAgICAgQVNTRVJUKHN0b3JhZ2VNYW5hZ2VyLT5t X3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5jb250YWlucyhzdG9yYWdlTmFtZXNwYWNlSUQpKTsK KyAgICAgICAgc3RvcmFnZU1hbmFnZXItPm1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLnJlbW92 ZShzdG9yYWdlTmFtZXNwYWNlSUQpOworICAgIH0pOwogfQogCiB2b2lkIFN0b3JhZ2VNYW5hZ2Vy OjpzZXRBbGxvd2VkU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VDb25uZWN0aW9uKHVpbnQ2NF90IHN0 b3JhZ2VOYW1lc3BhY2VJRCwgSVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbikKIHsK LSAgICBtX3F1ZXVlLT5kaXNwYXRjaChiaW5kKCZTdG9yYWdlTWFuYWdlcjo6c2V0QWxsb3dlZFNl c3Npb25TdG9yYWdlTmFtZXNwYWNlQ29ubmVjdGlvbkludGVybmFsLCB0aGlzLCBzdG9yYWdlTmFt ZXNwYWNlSUQsIFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+KGFsbG93ZWRDb25uZWN0aW9uKSkpOwor ICAgIFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gc3RvcmFnZU1hbmFnZXIodGhpcyk7CisgICAgUmVm UHRyPElQQzo6Q29ubmVjdGlvbj4gY29ubmVjdGlvbihhbGxvd2VkQ29ubmVjdGlvbik7CisKKyAg ICBtX3F1ZXVlLT5kaXNwYXRjaChbc3RvcmFnZU1hbmFnZXIsIGNvbm5lY3Rpb24sIHN0b3JhZ2VO YW1lc3BhY2VJRF0geworICAgICAgICBBU1NFUlQoc3RvcmFnZU1hbmFnZXItPm1fc2Vzc2lvblN0 b3JhZ2VOYW1lc3BhY2VzLmNvbnRhaW5zKHN0b3JhZ2VOYW1lc3BhY2VJRCkpOworCisgICAgICAg IHN0b3JhZ2VNYW5hZ2VyLT5tX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5nZXQoc3RvcmFnZU5h bWVzcGFjZUlEKS0+c2V0QWxsb3dlZENvbm5lY3Rpb24oY29ubmVjdGlvbi5nZXQoKSk7CisgICAg fSk7CiB9CiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNsb25lU2Vzc2lvblN0b3JhZ2VOYW1lc3Bh Y2UodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCB1aW50NjRfdCBuZXdTdG9yYWdlTmFtZXNw YWNlSUQpCiB7Ci0gICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFnZU1hbmFnZXI6OmNs b25lU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCwgdGhpcywgc3RvcmFnZU5hbWVzcGFj ZUlELCBuZXdTdG9yYWdlTmFtZXNwYWNlSUQpKTsKKyAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+ IHN0b3JhZ2VNYW5hZ2VyKHRoaXMpOworCisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3N0b3JhZ2VN YW5hZ2VyLCBzdG9yYWdlTmFtZXNwYWNlSUQsIG5ld1N0b3JhZ2VOYW1lc3BhY2VJRF0geworICAg ICAgICBTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSogc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UgPSBz dG9yYWdlTWFuYWdlci0+bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuZ2V0KHN0b3JhZ2VOYW1l c3BhY2VJRCk7CisgICAgICAgIGlmICghc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpIHsKKyAgICAg ICAgICAgIC8vIEZJWE1FOiBXZSBjYW4gZ2V0IGludG8gdGhpcyBzaXR1YXRpb24gaWYgc29tZW9u ZSBjbG9zZXMgdGhlIG9yaWdpbmF0aW5nIHBhZ2UgZnJvbSB3aXRoaW4gYQorICAgICAgICAgICAg Ly8gY3JlYXRlTmV3UGFnZSBjYWxsYmFjay4gV2UgYmFpbCBmb3Igbm93LCBidXQgd2Ugc2hvdWxk IHJlYWxseSBmaW5kIGEgd2F5IHRvIGtlZXAgdGhlIHNlc3Npb24gc3RvcmFnZSBhbGl2ZQorICAg ICAgICAgICAgLy8gc28gd2Ugd2UnbGwgY2xvbmUgdGhlIHNlc3Npb24gc3RvcmFnZSBjb3JyZWN0 bHkuCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBTZXNzaW9uU3Rv cmFnZU5hbWVzcGFjZSogbmV3U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UgPSBzdG9yYWdlTWFuYWdl ci0+bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuZ2V0KG5ld1N0b3JhZ2VOYW1lc3BhY2VJRCk7 CisgICAgICAgIEFTU0VSVChuZXdTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk7CisKKyAgICAgICAg c2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UtPmNsb25lVG8oKm5ld1Nlc3Npb25TdG9yYWdlTmFtZXNw YWNlKTsKKyAgICB9KTsKIH0KIAogdm9pZCBTdG9yYWdlTWFuYWdlcjo6cHJvY2Vzc1dpbGxPcGVu Q29ubmVjdGlvbihXZWJQcm9jZXNzUHJveHkqIHdlYlByb2Nlc3NQcm94eSkKQEAgLTQ2Miw3ICs0 OTYsMjMgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6cHJvY2Vzc1dpbGxDbG9zZUNvbm5lY3Rpb24o V2ViUHJvY2Vzc1Byb3h5KiB3ZWJQcm9jZXNzUHJveHkKIHsKICAgICB3ZWJQcm9jZXNzUHJveHkt PmNvbm5lY3Rpb24oKS0+cmVtb3ZlV29ya1F1ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpT dG9yYWdlTWFuYWdlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKIAotICAgIG1fcXVldWUtPmRp c3BhdGNoKGJpbmQoJlN0b3JhZ2VNYW5hZ2VyOjppbnZhbGlkYXRlQ29ubmVjdGlvbkludGVybmFs LCB0aGlzLCBSZWZQdHI8SVBDOjpDb25uZWN0aW9uPih3ZWJQcm9jZXNzUHJveHktPmNvbm5lY3Rp b24oKSkpKTsKKyAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0b3JhZ2VNYW5hZ2VyKHRoaXMp OworICAgIFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+IGNvbm5lY3Rpb24od2ViUHJvY2Vzc1Byb3h5 LT5jb25uZWN0aW9uKCkpOworCisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3N0b3JhZ2VNYW5hZ2Vy LCBjb25uZWN0aW9uXSB7CisgICAgICAgIFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPElQQzo6Q29u bmVjdGlvbj4sIHVpbnQ2NF90Pj4gY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXJzVG9SZW1v dmU7CisgICAgICAgIGF1dG8gc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uID0gc3RvcmFnZU1hbmFn ZXItPm1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uOworICAgICAgICBmb3IgKEhhc2hNYXA8c3Rk OjpwYWlyPFJlZlB0cjxJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4sIFJlZlB0cjxTdG9yYWdl QXJlYT4+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHN0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5iZWdp bigpLCBlbmQgPSBzdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uZW5kKCk7IGl0ICE9IGVuZDsgKytp dCkgeworICAgICAgICAgICAgaWYgKGl0LT5rZXkuZmlyc3QgIT0gY29ubmVjdGlvbikKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgaXQtPnZhbHVlLT5yZW1vdmVMaXN0 ZW5lcigqaXQtPmtleS5maXJzdCwgaXQtPmtleS5zZWNvbmQpOworICAgICAgICAgICAgY29ubmVj dGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXJzVG9SZW1vdmUuYXBwZW5kKGl0LT5rZXkpOworICAgICAg ICB9CisKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb25uZWN0aW9uQW5kU3RvcmFn ZU1hcElEUGFpcnNUb1JlbW92ZS5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIHN0b3JhZ2VNYW5h Z2VyLT5tX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5yZW1vdmUoY29ubmVjdGlvbkFuZFN0b3Jh Z2VNYXBJRFBhaXJzVG9SZW1vdmVbaV0pOworICAgIH0pOwogfQogCiB2b2lkIFN0b3JhZ2VNYW5h Z2VyOjpnZXRPcmlnaW5zKHN0ZDo6ZnVuY3Rpb248dm9pZCAoVmVjdG9yPFJlZlB0cjxXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbj4+KT4gY29tcGxldGlvbkhhbmRsZXIpCkBAIC02NzgsNDIgKzcyOCw2 IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNsZWFyKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlv biwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1CiAgICAgY29ubmVjdGlvbi5zZW5kKE1lc3NhZ2Vz OjpTdG9yYWdlQXJlYU1hcDo6RGlkQ2xlYXIoc3RvcmFnZU1hcFNlZWQpLCBzdG9yYWdlTWFwSUQp OwogfQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZUludGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCwgSVBDOjpDb25uZWN0aW9uKiBh bGxvd2VkQ29ubmVjdGlvbiwgdW5zaWduZWQgcXVvdGFJbkJ5dGVzKQotewotICAgIEFTU0VSVCgh bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuY29udGFpbnMoc3RvcmFnZU5hbWVzcGFjZUlEKSk7 Ci0KLSAgICBtX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5zZXQoc3RvcmFnZU5hbWVzcGFjZUlE LCBTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZTo6Y3JlYXRlKGFsbG93ZWRDb25uZWN0aW9uLCBxdW90 YUluQnl0ZXMpKTsKLX0KLQotdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVzdHJveVNlc3Npb25TdG9y YWdlTmFtZXNwYWNlSW50ZXJuYWwodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKQotewotICAg IEFTU0VSVChtX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5jb250YWlucyhzdG9yYWdlTmFtZXNw YWNlSUQpKTsKLSAgICBtX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5yZW1vdmUoc3RvcmFnZU5h bWVzcGFjZUlEKTsKLX0KLQotdm9pZCBTdG9yYWdlTWFuYWdlcjo6c2V0QWxsb3dlZFNlc3Npb25T dG9yYWdlTmFtZXNwYWNlQ29ubmVjdGlvbkludGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3Bh Y2VJRCwgSVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbikKLXsKLSAgICBBU1NFUlQo bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuY29udGFpbnMoc3RvcmFnZU5hbWVzcGFjZUlEKSk7 Ci0KLSAgICBtX3Nlc3Npb25TdG9yYWdlTmFtZXNwYWNlcy5nZXQoc3RvcmFnZU5hbWVzcGFjZUlE KS0+c2V0QWxsb3dlZENvbm5lY3Rpb24oYWxsb3dlZENvbm5lY3Rpb24pOwotfQotCi12b2lkIFN0 b3JhZ2VNYW5hZ2VyOjpjbG9uZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlSW50ZXJuYWwodWludDY0 X3Qgc3RvcmFnZU5hbWVzcGFjZUlELCB1aW50NjRfdCBuZXdTdG9yYWdlTmFtZXNwYWNlSUQpCi17 Ci0gICAgU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UqIHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlID0g bV9zZXNzaW9uU3RvcmFnZU5hbWVzcGFjZXMuZ2V0KHN0b3JhZ2VOYW1lc3BhY2VJRCk7Ci0gICAg aWYgKCFzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSkgewotICAgICAgICAvLyBGSVhNRTogV2UgY2Fu IGdldCBpbnRvIHRoaXMgc2l0dWF0aW9uIGlmIHNvbWVvbmUgY2xvc2VzIHRoZSBvcmlnaW5hdGlu ZyBwYWdlIGZyb20gd2l0aGluIGEKLSAgICAgICAgLy8gY3JlYXRlTmV3UGFnZSBjYWxsYmFjay4g V2UgYmFpbCBmb3Igbm93LCBidXQgd2Ugc2hvdWxkIHJlYWxseSBmaW5kIGEgd2F5IHRvIGtlZXAg dGhlIHNlc3Npb24gc3RvcmFnZSBhbGl2ZQotICAgICAgICAvLyBzbyB3ZSB3ZSdsbCBjbG9uZSB0 aGUgc2Vzc2lvbiBzdG9yYWdlIGNvcnJlY3RseS4KLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQot ICAgIFNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKiBuZXdTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSA9 IG1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLmdldChuZXdTdG9yYWdlTmFtZXNwYWNlSUQpOwot ICAgIEFTU0VSVChuZXdTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSk7Ci0KLSAgICBzZXNzaW9uU3Rv cmFnZU5hbWVzcGFjZS0+Y2xvbmVUbygqbmV3U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOwotfQot CiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjphcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUoKQogewogICAg IEJpbmFyeVNlbWFwaG9yZSBzZW1hcGhvcmU7CkBAIC03MzIsMjIgKzc0Niw2IEBAIHZvaWQgU3Rv cmFnZU1hbmFnZXI6OmFwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZSgpCiAgICAgc2VtYXBob3JlLndh aXQoc3RkOjpudW1lcmljX2xpbWl0czxkb3VibGU+OjptYXgoKSk7CiB9CiAKLXZvaWQgU3RvcmFn ZU1hbmFnZXI6OmludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwoSVBDOjpDb25uZWN0aW9uKiBj b25uZWN0aW9uKQotewotICAgIFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPElQQzo6Q29ubmVjdGlv bj4sIHVpbnQ2NF90Pj4gY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXJzVG9SZW1vdmU7Ci0g ICAgSGFzaE1hcDxzdGQ6OnBhaXI8UmVmUHRyPElQQzo6Q29ubmVjdGlvbj4sIHVpbnQ2NF90Piwg UmVmUHRyPFN0b3JhZ2VBcmVhPj4gc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uID0gbV9zdG9yYWdl QXJlYXNCeUNvbm5lY3Rpb247Ci0gICAgZm9yIChIYXNoTWFwPHN0ZDo6cGFpcjxSZWZQdHI8SVBD OjpDb25uZWN0aW9uPiwgdWludDY0X3Q+LCBSZWZQdHI8U3RvcmFnZUFyZWE+Pjo6Y29uc3RfaXRl cmF0b3IgaXQgPSBzdG9yYWdlQXJlYXNCeUNvbm5lY3Rpb24uYmVnaW4oKSwgZW5kID0gc3RvcmFn ZUFyZWFzQnlDb25uZWN0aW9uLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgaWYg KGl0LT5rZXkuZmlyc3QgIT0gY29ubmVjdGlvbikKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0g ICAgICAgIGl0LT52YWx1ZS0+cmVtb3ZlTGlzdGVuZXIoKml0LT5rZXkuZmlyc3QsIGl0LT5rZXku c2Vjb25kKTsKLSAgICAgICAgY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXJzVG9SZW1vdmUu YXBwZW5kKGl0LT5rZXkpOwotICAgIH0KLQotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29u bmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXJzVG9SZW1vdmUuc2l6ZSgpOyArK2kpCi0gICAgICAg IG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLnJlbW92ZShjb25uZWN0aW9uQW5kU3RvcmFnZU1h cElEUGFpcnNUb1JlbW92ZVtpXSk7Ci19Ci0KIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYSog U3RvcmFnZU1hbmFnZXI6OmZpbmRTdG9yYWdlQXJlYShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rp b24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCkgY29uc3QKIHsKICAgICBzdGQ6OnBhaXI8SVBDOjpD b25uZWN0aW9uKiwgdWludDY0X3Q+IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKCZjb25u ZWN0aW9uLCBzdG9yYWdlTWFwSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T dG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKaW5kZXggNjJiOTk4ZjllOTg2NjM3ZWM2NDI0Y2U2ZjM2 NGFlMzE1ODk3YjU2NS4uOTlmNmUzOTM2ZTRkOTdhODJhYWY3MzBlZTE2Y2M1NDViNDMzMjRkNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdl ci5oCkBAIC04NCwxMyArODQsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlSXRlbShJUEM6 OkNvbm5lY3Rpb24mLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQsIHVpbnQ2NF90IHNvdXJjZVN0b3Jh Z2VBcmVhSUQsIHVpbnQ2NF90IHN0b3JhZ2VNYXBTZWVkLCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcpOwogICAgIHZvaWQgY2xlYXIoSVBDOjpDb25uZWN0aW9uJiwg dWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzb3VyY2VTdG9yYWdlQXJlYUlELCB1aW50 NjRfdCBzdG9yYWdlTWFwU2VlZCwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpOwogCi0gICAgdm9p ZCBjcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUludGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VO YW1lc3BhY2VJRCwgSVBDOjpDb25uZWN0aW9uKiBhbGxvd2VkQ29ubmVjdGlvbiwgdW5zaWduZWQg cXVvdGFJbkJ5dGVzKTsKLSAgICB2b2lkIGRlc3Ryb3lTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZUlu dGVybmFsKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3BhY2VJRCk7Ci0gICAgdm9pZCBzZXRBbGxvd2Vk U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VDb25uZWN0aW9uSW50ZXJuYWwodWludDY0X3Qgc3RvcmFn ZU5hbWVzcGFjZUlELCBJUEM6OkNvbm5lY3Rpb24qIGFsbG93ZWRDb25uZWN0aW9uKTsKLSAgICB2 b2lkIGNsb25lU2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VJbnRlcm5hbCh1aW50NjRfdCBzdG9yYWdl TmFtZXNwYWNlSUQsIHVpbnQ2NF90IG5ld1N0b3JhZ2VOYW1lc3BhY2VJRCk7Ci0KLSAgICB2b2lk IGludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwoSVBDOjpDb25uZWN0aW9uKik7Ci0KICAgICBj bGFzcyBTdG9yYWdlQXJlYTsKICAgICBTdG9yYWdlQXJlYSogZmluZFN0b3JhZ2VBcmVhKElQQzo6 Q29ubmVjdGlvbiYsIHVpbnQ2NF90KSBjb25zdDsKIAo=