143614 2015-04-10 12:18:52 -0700 _WKWebsiteDataStore doesn't track and remove offline application cache entries 2015-04-10 12:41:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1084363 0 andersca 2015-04-10 12:18:52 -0700 _WKWebsiteDataStore doesn't track and remove offline application cache entries 1084364 1 250526 andersca 2015-04-10 12:22:16 -0700 Created attachment 250526 Patch 1084366 2 250526 kling 2015-04-10 12:33:16 -0700 Comment on attachment 250526 Patch r=me 1084367 3 andersca 2015-04-10 12:41:02 -0700 Committed r182639: <http://trac.webkit.org/changeset/182639> 250526 2015-04-10 12:22:16 -0700 2015-04-10 12:33:16 -0700 Patch bug-143614-20150410122124.patch text/plain 10328 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODBjMmVmOTllZGIyZjU5 MmRjMmNkODVlYjM2OWE0NjhkYmQ2ZTZkNC4uZmQ2Y2VlODY0N2M0YzNmOGRmNWMzMjlmNjE0MDQx ZGE3NzU1NDBmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA0LTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgX1dLV2Vic2l0ZURh dGFTdG9yZSBkb2Vzbid0IHRyYWNrIGFuZCByZW1vdmUgb2ZmbGluZSBhcHBsaWNhdGlvbiBjYWNo ZSBlbnRyaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDM2MTQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjAyNDMyMzUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVR5cGVzLmg6CisgICAgICAgIEFkZCBXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2Vi QXBwbGljYXRpb25DYWNoZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi c2l0ZURhdGFSZWNvcmQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNp dGVEYXRhUmVjb3JkLm1tOgorICAgICAgICAoZGF0YVR5cGVzVG9TdHJpbmcpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oOgorICAg ICAgICAoV2ViS2l0Ojp0b1dlYnNpdGVEYXRhVHlwZXMpOgorICAgICAgICAoV2ViS2l0Ojp0b1dL V2Vic2l0ZURhdGFUeXBlcyk6CisgICAgICAgIEFkZCBXS1dlYnNpdGVEYXRhVHlwZU9mZmxpbmVX ZWJBcHBsaWNhdGlvbkNhY2hlLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl YnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpm ZXRjaERhdGEpOgorICAgICAgICBDcmVhdGUgYSBjdXN0b20gYXBwbGljYXRpb24gY2FjaGUgc3Rv cmFnZSBhbmQgZmV0Y2ggdGhlIG9yaWdpbnMgZnJvbSBpdC4KKworICAgICAgICAoV2ViS2l0OjpX ZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKToKKyAgICAgICAgRGVsZXRlIGVpdGhlciBhbGwg dGhlIGNhY2hlIGVudHJpZXMgKHNpbmNlIHdlIGRvbid0IHRyYWNrIHRpbWUgaW4gdGhlIGFwcGxp Y2F0aW9uIGNhY2hlKSwKKyAgICAgICAgb3IgdGhlIG9uZXMgc3BlY2lmaWVkIGJ5IHRoZSBnaXZl biBlbnRyaWVzLgorCiAyMDE1LTA0LTEwICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFtNYWNdIFJlZmFjdG9yIE1lZGlhUGxheWJhY2tUYXJnZXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5 cGVzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBl cy5oCmluZGV4IGU4ZjExMDM4MjVhMGJjM2FiYzJmMzM3ZmFlYmY2YzRhYmZkNjYyNmQuLjNmMmVk ODZlMDVlNWVmNWU1YWRiNGNhNWQxOWVlNTBlNDdmMGRiMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmgKKysrIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlwZXMuaApAQCAtMzIsOCAr MzIsOSBAQCBlbnVtIFdlYnNpdGVEYXRhVHlwZXMgewogICAgIFdlYnNpdGVEYXRhVHlwZUNvb2tp ZXMgPSAxIDw8IDAsCiAgICAgV2Vic2l0ZURhdGFUeXBlRGlza0NhY2hlID0gMSA8PCAxLAogICAg IFdlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlID0gMSA8PCAyLAotICAgIFdlYnNpdGVEYXRhVHlw ZUxvY2FsU3RvcmFnZSA9IDEgPDwgMywKLSAgICBXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFz ZXMgPSAxIDw8IDQsCisgICAgV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGUgPSAxIDw8IDMsCisgICAgV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlID0gMSA8PCA0LAor ICAgIFdlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyA9IDEgPDwgNSwKIH07CiAKIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVE YXRhUmVjb3JkLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNp dGVEYXRhUmVjb3JkLmgKaW5kZXggZGY0NGE2NTA2YTE4Y2M0OGFmZTExMDRkZGM4NTI5ZDUwYzIy NTVjZS4uZTFkNzM4YTA3M2M5NjMwZDUzYTA3MDk2ZmQwMzYyYzgxODk5YzQ3MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJlY29y ZC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURh dGFSZWNvcmQuaApAQCAtMzMsOSArMzMsMTAgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVn ZXIsIFdLV2Vic2l0ZURhdGFUeXBlcykgewogICAgIFdLV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9 IDEgPDwgMCwKICAgICBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZSA9IDEgPDwgMSwKICAgICBX S1dlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlID0gMSA8PCAyLAorICAgIFdLV2Vic2l0ZURhdGFU eXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSAxIDw8IDMsCiAKLSAgICBXS1dlYnNpdGVE YXRhVHlwZUxvY2FsU3RvcmFnZSA9IDEgPDwgMywKLSAgICBXS1dlYnNpdGVEYXRhVHlwZVdlYlNR TERhdGFiYXNlcyA9IDEgPDwgNCwKKyAgICBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSA9 IDEgPDwgNCwKKyAgICBXS1dlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyA9IDEgPDwgNSwK IAogICAgIFdLV2Vic2l0ZURhdGFUeXBlQWxsID0gTlNVSW50ZWdlck1heCwKIH0gV0tfRU5VTV9B VkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhUmVjb3JkLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJlY29yZC5tbQppbmRl eCBiZjg5YjAyYWRmYWMxZWU4MGU0MWY3YTc5N2NmMWRkZmVmYmYzYTk3Li4zZmU0ZWVkNmI0OGU1 MTE4MzdhZGRmOTM4NTJkZWQyMzk2OTM0NzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNvcmQubW0KQEAgLTQ3 LDYgKzQ3LDggQEAgc3RhdGljIE5TU3RyaW5nICpkYXRhVHlwZXNUb1N0cmluZyhXS1dlYnNpdGVE YXRhVHlwZXMgZGF0YVR5cGVzKQogICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiRGlzayBDYWNo ZSJdOwogICAgIGlmIChkYXRhVHlwZXMgJiBXS1dlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlKQog ICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiTWVtb3J5IENhY2hlIl07CisgICAgaWYgKGRhdGFU eXBlcyAmIFdLV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUpCisgICAg ICAgIFthcnJheSBhZGRPYmplY3Q6QCJPZmZsaW5lIFdlYiBBcHBsaWNhdGlvbiBDYWNoZSJdOwog ICAgIGlmIChkYXRhVHlwZXMgJiBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSkKICAgICAg ICAgW2FycmF5IGFkZE9iamVjdDpAIkxvY2FsIFN0b3JhZ2UiXTsKICAgICBpZiAoZGF0YVR5cGVz ICYgV0tXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNv cmRJbnRlcm5hbC5oCmluZGV4IDcwMzcxOTNmYjdiNmYxMjg3NmNjMTk0YmU3ZTE0OTJkNTU0YTE0 NjMuLmZiZWRiM2I5ZDgwN2E3YzE4MTA5MTUzMmVmMTQ2YmNhZjdhYmUxOWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNvcmRJ bnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vi c2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oCkBAIC01MCw2ICs1MCw4IEBAIHN0YXRpYyBpbmxpbmUg V2ViS2l0OjpXZWJzaXRlRGF0YVR5cGVzIHRvV2Vic2l0ZURhdGFUeXBlcyhXS1dlYnNpdGVEYXRh VHlwZXMgd2tXCiAgICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlczo6 V2Vic2l0ZURhdGFUeXBlRGlza0NhY2hlOwogICAgIGlmICh3a1dlYnNpdGVEYXRhVHlwZXMgJiBX S1dlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlKQogICAgICAgICB3ZWJzaXRlRGF0YVR5cGVzIHw9 IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlOworICAgIGlmICh3 a1dlYnNpdGVEYXRhVHlwZXMgJiBXS1dlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlKQorICAgICAgICB3ZWJzaXRlRGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6Oldl YnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlOwogICAgIGlmICh3a1dlYnNp dGVEYXRhVHlwZXMgJiBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSkKICAgICAgICAgd2Vi c2l0ZURhdGFUeXBlcyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVMb2NhbFN0 b3JhZ2U7CiAgICAgaWYgKHdrV2Vic2l0ZURhdGFUeXBlcyAmIFdLV2Vic2l0ZURhdGFUeXBlV2Vi U1FMRGF0YWJhc2VzKQpAQCAtNzAsNiArNzIsOCBAQCBzdGF0aWMgaW5saW5lIFdLV2Vic2l0ZURh dGFUeXBlcyB0b1dLV2Vic2l0ZURhdGFUeXBlcyhpbnQgd2Vic2l0ZURhdGFUeXBlcykKICAgICAg ICAgd2tXZWJzaXRlRGF0YVR5cGVzIHw9IFdLV2Vic2l0ZURhdGFUeXBlRGlza0NhY2hlOwogICAg IGlmICh3ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBl TWVtb3J5Q2FjaGUpCiAgICAgICAgIHdrV2Vic2l0ZURhdGFUeXBlcyB8PSBXS1dlYnNpdGVEYXRh VHlwZU1lbW9yeUNhY2hlOworICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0ZURhdGFU eXBlczo6V2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUpCisgICAgICAg IHdrV2Vic2l0ZURhdGFUeXBlcyB8PSBXS1dlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlOwogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlczo6 V2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlKQogICAgICAgICB3a1dlYnNpdGVEYXRhVHlwZXMg fD0gV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2U7CiAgICAgaWYgKHdlYnNpdGVEYXRhVHlw ZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0 ZURhdGFTdG9yZS5jcHAKaW5kZXggZTBkMGE2ZTM0NmJlNDZiNmI5ZWQ3ZWMwZDFkMzc4ZWEyOGQw Y2JmNy4uZGFkNWQ4YzY5YTc4OWNiMTE4ZjJkYWRmNmFhZTVjYjQzOTQzZmYzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIlN0b3JhZ2VNYW5hZ2VyLmgi CiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNpbmNsdWRlICJXZWJzaXRlRGF0YS5oIgor I2luY2x1ZGUgPFdlYkNvcmUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL0RhdGFiYXNlVHJhY2tlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvT3JpZ2luTG9jay5o PgogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+CkBAIC0yNzcsNiArMjc4LDI4IEBAIHZvaWQgV2Vi c2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVzLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQKICAgICAgICAgfSk7CiAgICAgfQogCisgICAgaWYgKGRhdGFUeXBlcyAm IFdlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlICYmICFpc05vblBlcnNp c3RlbnQoKSkgeworICAgICAgICBTdHJpbmdDYXB0dXJlIGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rv cnkgeyBtX2FwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgfTsKKworICAgICAgICBjYWxsYmFja0Fn Z3JlZ2F0b3ItPmFkZFBlbmRpbmdDYWxsYmFjaygpOworCisgICAgICAgIG1fcXVldWUtPmRpc3Bh dGNoKFthcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LCBjYWxsYmFja0FnZ3JlZ2F0b3JdIHsKKyAg ICAgICAgICAgIGF1dG8gc3RvcmFnZSA9IFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl OjpjcmVhdGUoYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeS5zdHJpbmcoKSwgIkZpbGVzIik7CisK KyAgICAgICAgICAgIEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gb3Jp Z2luczsKKyAgICAgICAgICAgIHN0b3JhZ2UtPmdldE9yaWdpbnNXaXRoQ2FjaGUob3JpZ2lucyk7 CisKKyAgICAgICAgICAgIFdURjo6UnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjYWxsYmFja0Fn Z3JlZ2F0b3IsIG9yaWdpbnNdKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgV2Vic2l0ZURh dGEgd2Vic2l0ZURhdGE7CisKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIG9yaWdpbiA6IG9y aWdpbnMpCisgICAgICAgICAgICAgICAgICAgIHdlYnNpdGVEYXRhLmVudHJpZXMuYXBwZW5kKFdl YnNpdGVEYXRhOjpFbnRyeSB7IG9yaWdpbiwgV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGUgfSk7CisKKyAgICAgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPnJl bW92ZVBlbmRpbmdDYWxsYmFjayhXVEY6Om1vdmUod2Vic2l0ZURhdGEpKTsKKyAgICAgICAgICAg IH0pOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURh dGFUeXBlV2ViU1FMRGF0YWJhc2VzICYmICFpc05vblBlcnNpc3RlbnQoKSkgewogICAgICAgICBT dHJpbmdDYXB0dXJlIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5IHsgbV93ZWJTUUxEYXRhYmFzZURp cmVjdG9yeSB9OwogCkBAIC0yODYsNyArMzA5LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpm ZXRjaERhdGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6ZnVuY3Rpb248dm9pZAog ICAgICAgICAgICAgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IG9yaWdp bnM7CiAgICAgICAgICAgICBXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXJXaXRoRGF0 YWJhc2VQYXRoKHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5LnN0cmluZygpKS0+b3JpZ2lucyhvcmln aW5zKTsKIAotICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt3ZWJTUUxEYXRh YmFzZURpcmVjdG9yeSwgY2FsbGJhY2tBZ2dyZWdhdG9yLCBvcmlnaW5zXSgpIG11dGFibGUgewor ICAgICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjYWxsYmFja0FnZ3JlZ2F0b3Is IG9yaWdpbnNdKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgV2Vic2l0ZURhdGEgd2Vic2l0 ZURhdGE7CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBvcmlnaW5zKQogICAg ICAgICAgICAgICAgICAgICB3ZWJzaXRlRGF0YS5lbnRyaWVzLmFwcGVuZChXZWJzaXRlRGF0YTo6 RW50cnkgeyBXVEY6Om1vdmUob3JpZ2luKSwgV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJhc2Vz IH0pOwpAQCAtNDIyLDYgKzQ0NSwyMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURh dGEoV2Vic2l0ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZQogICAgICAg ICB9KTsKICAgICB9CiAKKyAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlT2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGUgJiYgIWlzTm9uUGVyc2lzdGVudCgpKSB7CisgICAgICAgIFN0 cmluZ0NhcHR1cmUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSB7IG1fYXBwbGljYXRpb25DYWNo ZURpcmVjdG9yeSB9OworCisgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0Nh bGxiYWNrKCk7CisKKyAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW2FwcGxpY2F0aW9uQ2FjaGVE aXJlY3RvcnksIGNhbGxiYWNrQWdncmVnYXRvcl0geworICAgICAgICAgICAgYXV0byBzdG9yYWdl ID0gV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmNyZWF0ZShhcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5LnN0cmluZygpLCAiRmlsZXMiKTsKKworICAgICAgICAgICAgc3RvcmFnZS0+ ZGVsZXRlQWxsRW50cmllcygpOworCisgICAgICAgICAgICBXVEY6OlJ1bkxvb3A6Om1haW4oKS5k aXNwYXRjaChbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7CisgICAgICAgICAgICAgICAgY2FsbGJhY2tB Z2dyZWdhdG9yLT5yZW1vdmVQZW5kaW5nQ2FsbGJhY2soKTsKKyAgICAgICAgICAgIH0pOworICAg ICAgICB9KTsKKyAgICB9CisKICAgICBpZiAoZGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlV2Vi U1FMRGF0YWJhc2VzICYmICFpc05vblBlcnNpc3RlbnQoKSkgewogICAgICAgICBTdHJpbmdDYXB0 dXJlIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5IHsgbV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSB9 OwogCkBAIC01NDgsNiArNTg3LDI4IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0 YShXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcywgY29uc3QgVmVjdG9yPFdlYnNpCiAgICAgICAg IH0pOwogICAgIH0KIAorICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVPZmZsaW5l V2ViQXBwbGljYXRpb25DYWNoZSAmJiAhaXNOb25QZXJzaXN0ZW50KCkpIHsKKyAgICAgICAgU3Ry aW5nQ2FwdHVyZSBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5IHsgbV9hcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5IH07CisKKyAgICAgICAgSGFzaFNldDxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlP cmlnaW4+PiBvcmlnaW5zOworICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGRhdGFSZWNvcmQgOiBk YXRhUmVjb3JkcykgeworICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBvcmlnaW4gOiBkYXRh UmVjb3JkLm9yaWdpbnMpCisgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKKyAg ICAgICAgfQorCisgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNr KCk7CisgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFtvcmlnaW5zLCBhcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5LCBjYWxsYmFja0FnZ3JlZ2F0b3JdIHsKKyAgICAgICAgICAgIGF1dG8gc3RvcmFn ZSA9IFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjcmVhdGUoYXBwbGljYXRpb25D YWNoZURpcmVjdG9yeS5zdHJpbmcoKSwgIkZpbGVzIik7CisKKyAgICAgICAgICAgIGZvciAoY29u c3QgYXV0byYgb3JpZ2luIDogb3JpZ2lucykKKyAgICAgICAgICAgICAgICBzdG9yYWdlLT5kZWxl dGVDYWNoZUZvck9yaWdpbigqb3JpZ2luKTsKKworICAgICAgICAgICAgV1RGOjpSdW5Mb29wOjpt YWluKCkuZGlzcGF0Y2goW2NhbGxiYWNrQWdncmVnYXRvcl0geworICAgICAgICAgICAgICAgIGNh bGxiYWNrQWdncmVnYXRvci0+cmVtb3ZlUGVuZGluZ0NhbGxiYWNrKCk7CisgICAgICAgICAgICB9 KTsKKyAgICAgICAgfSk7CisgICAgfQorCiAgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRh VHlwZVdlYlNRTERhdGFiYXNlcyAmJiAhaXNOb25QZXJzaXN0ZW50KCkpIHsKICAgICAgICAgU3Ry aW5nQ2FwdHVyZSB3ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSB7IG1fd2ViU1FMRGF0YWJhc2VEaXJl Y3RvcnkgfTsKIAo=